Merge pull request #2 from keremdemirer/master

Resize images before upload - configurable

GoogleImageShell/ConfigForm.cs

@@ -27,8 +27,9 @@ private void installButton_Click(object sender, EventArgs e)
             string menuText = menuTextTextBox.Text;
             bool includeFileName = includeFileNameCheckBox.Checked;
             bool allUsers = allUsersCheckBox.Checked;
+            bool resizeOnUpload = resizeOnUploadCheckbox.Checked;
             ImageFileType[] types = fileTypeListBox.CheckedItems.Cast<ImageFileType>().ToArray();
-            Install(menuText, includeFileName, allUsers, types);
+            Install(menuText, includeFileName, allUsers, resizeOnUpload, types);
         }
 
         private void uninstallButton_Click(object sender, EventArgs e)
@@ -38,11 +39,11 @@ private void uninstallButton_Click(object sender, EventArgs e)
             Uninstall(allUsers, types);
         }
 
-        private static void Install(string menuText, bool includeFileName, bool allUsers, ImageFileType[] types)
+        private static void Install(string menuText, bool includeFileName, bool allUsers, bool resizeOnUpload, ImageFileType[] types)
         {
             try
             {
-                ShortcutMenu.InstallHandler(menuText, includeFileName, allUsers, types);
+                ShortcutMenu.InstallHandler(menuText, includeFileName, allUsers, resizeOnUpload, types);
             }
             catch (Exception ex)
             {

GoogleImageShell/GoogleImages.cs

@@ -1,4 +1,6 @@
 using System;
+using System.Drawing;
+using System.Drawing.Imaging;
 using System.IO;
 using System.Linq;
 using System.Net;
@@ -11,14 +13,61 @@ namespace GoogleImageShell
 {
     public static class GoogleImages
     {
-        public static async Task<string> Search(string imagePath, bool includeFileName, CancellationToken cancelToken)
+        private const int _maxImageSize = 800;
+
+        public static async Task<string> Search(string imagePath, bool includeFileName, bool resizeOnUpload, CancellationToken cancelToken)
         {
             var handler = new HttpClientHandler();
             handler.AllowAutoRedirect = false;
+
+            StringContent content = null;
+
+
+            if (resizeOnUpload)
+            {
+                try
+                {
+
+                }
+                catch (Exception)
+                {
+
+                }
+                using (Bitmap bmp = new Bitmap(imagePath))
+                {
+                    if (bmp.Width > _maxImageSize || bmp.Height > _maxImageSize)
+                    {
+                        var newSize = ResizeKeepAspect(bmp.Size, _maxImageSize, _maxImageSize);
+
+                        using (var newBmp = new Bitmap(newSize.Width, newSize.Height))
+                        {
+                            using (Graphics g = Graphics.FromImage(newBmp))
+                            {
+                                g.DrawImage(bmp, new Rectangle(0, 0, newSize.Width, newSize.Height));
+                            }
+
+                            using (var ms = new MemoryStream())
+                            {
+                                newBmp.Save(ms, ImageFormat.Jpeg);
+
+                                content = new StringContent(BinaryToBase64Compat(ms.ToArray()));
+                            }
+                        }
+                    }
+                }
+            }
+
+
+
+            if (content == null)
+            {
+                content = new StringContent(FileToBase64Compat(imagePath));
+            }
+
             using (var client = new HttpClient(handler))
             {
                 var form = new MultipartFormDataContentCompat();
-                form.Add(new StringContent(FileToBase64Compat(imagePath)), "image_content");
+                form.Add(content, "image_content");
                 if (includeFileName)
                 {
                     form.Add(new StringContent(Path.GetFileName(imagePath)), "filename");
@@ -33,13 +82,26 @@ public static async Task<string> Search(string imagePath, bool includeFileName,
             }
         }
 
+        private static string BinaryToBase64Compat(byte[] content)
+        {
+            string base64 = Convert.ToBase64String(content).Replace('+', '-').Replace('/', '_');
+            return base64;
+        }
+
+
         private static string FileToBase64Compat(string imagePath)
         {
             byte[] content = File.ReadAllBytes(imagePath);
-            string base64 = Convert.ToBase64String(content).Replace('+', '-').Replace('/', '_');
+            string base64 = BinaryToBase64Compat(content);
             return base64;
         }
-
+
+        public static Size ResizeKeepAspect(Size src, int maxWidth, int maxHeight)
+        {
+            decimal rnd = Math.Min(maxWidth / (decimal)src.Width, maxHeight / (decimal)src.Height);
+            return new Size((int)Math.Round(src.Width * rnd), (int)Math.Round(src.Height * rnd));
+        }
+
         private class MultipartFormDataContentCompat : MultipartContent
         {
             public MultipartFormDataContentCompat() : base("form-data")

GoogleImageShell/ShortcutMenu.cs

@@ -18,14 +18,18 @@ public static class ShortcutMenu
             {ImageFileType.BMP, new[] {".bmp"}}
         };
 
-        private static string CreateProgramCommand(bool includeFileName)
+        private static string CreateProgramCommand(bool includeFileName, bool resizeOnUpload)
         {
             string exePath = new Uri(Assembly.GetExecutingAssembly().CodeBase).LocalPath;
             string command = $"\"{exePath}\" search \"%1\"";
             if (includeFileName)
             {
                 command += " -n";
             }
+            if (resizeOnUpload)
+            {
+                command += " -r";
+            }
             return command;
         }
 
@@ -37,9 +41,9 @@ private static RegistryKey GetShellKey(bool allUsers, string fileType)
             return shellKey;
         }
 
-        public static void InstallHandler(string menuText, bool includeFileName, bool allUsers, ImageFileType[] types)
+        public static void InstallHandler(string menuText, bool includeFileName, bool allUsers, bool resizeOnUpload, ImageFileType[] types)
         {
-            string command = CreateProgramCommand(includeFileName);
+            string command = CreateProgramCommand(includeFileName, resizeOnUpload);
             foreach (ImageFileType fileType in types)
             {
                 foreach (string typeExt in FileTypeMap[fileType])

GoogleImageShell/UploadForm.cs

@@ -10,6 +10,8 @@ public partial class UploadForm : Form
     {
         private readonly string _imagePath;
         private readonly bool _includeFileName;
+        private readonly bool _resizeOnUpload;
+
         private readonly CancellationTokenSource _cancelTokenSource = new CancellationTokenSource();
 
         public UploadForm(string[] args)
@@ -19,6 +21,7 @@ public UploadForm(string[] args)
             {
                 string arg = args[i];
                 if (arg == "-n") _includeFileName = true;
+                else if (arg == "-r") _resizeOnUpload = true;
                 else _imagePath = arg;
             }
         }
@@ -27,7 +30,9 @@ private void UploadForm_Load(object sender, EventArgs e)
         {
             Log("Uploading image: " + _imagePath);
             Log("Include file name: " + _includeFileName);
-            Task<string> task = GoogleImages.Search(_imagePath, _includeFileName, _cancelTokenSource.Token);
+            Log("Resize on upload: " + _resizeOnUpload);
+
+            Task<string> task = GoogleImages.Search(_imagePath, _includeFileName, _resizeOnUpload, _cancelTokenSource.Token);
             task.ContinueWith(OnUploadComplete, TaskScheduler.FromCurrentSynchronizationContext());
         }