#37 improvements to image resize

Ruben2776 · Nov 30, 2021 · e3b05ed · e3b05ed
1 parent 02ff1f6
commit e3b05ed
Show file tree

Hide file tree

Showing 3 changed files with 81 additions and 17 deletions.
diff --git a/PicView/ImageHandling/BatchFunctions.cs b/PicView/ImageHandling/BatchFunctions.cs
@@ -103,9 +103,6 @@ internal static string Run(FileInfo sourceFile, int width, int height, int quali
             if (sourceFile.DirectoryName + @"\" == outputFolder)
             {
                 _ = ImageFunctions.OptimizeImageAsync(sourceFile.FullName).ConfigureAwait(false);
-                var newSize = FileFunctions.GetSizeReadable(new FileInfo(sourceFile.FullName).Length);
-                sb.Append(sourceFile.DirectoryName).Append('/').Append(sourceFile.Name).Append(' ').Append(FileFunctions.GetSizeReadable(sourceFile.Length))
-                    .Append(" 🠚 ").Append(sourceFile.Name).Append(' ').Append(newSize).AppendLine(Environment.NewLine);
             }
             else if (ext is null)
             {
@@ -115,20 +112,19 @@ internal static string Run(FileInfo sourceFile, int width, int height, int quali
                 }
                 else
                 {
-                    _ = SaveImages.SaveImageAsync(0, false, null, sourceFile.FullName, destination, null, false).ConfigureAwait(false);
-                }
-
-                if (compress.HasValue)
-                {
-                    Optimize(compress.Value, destination);
+                    SaveImages.SaveImage(null, sourceFile.FullName, destination, null, null, quality, ext);
                 }
             }
             else
             {
-                destination = Path.ChangeExtension(destination, ext);
-                _ = SaveImages.SaveImageAsync(0, false, null, sourceFile.FullName, destination, null, false).ConfigureAwait(false);
+                SaveImages.SaveImage(null, sourceFile.FullName, destination, null, null, quality, ext);
             }
 
+            Optimize(compress.Value, destination);
+            var newSize = FileFunctions.GetSizeReadable(new FileInfo(sourceFile.FullName).Length);
+            sb.Append(sourceFile.DirectoryName).Append('/').Append(sourceFile.Name).Append(' ').Append(FileFunctions.GetSizeReadable(sourceFile.Length))
+                .Append(" 🠚 ").Append(sourceFile.Name).Append(' ').Append(newSize).AppendLine(Environment.NewLine);
+
             return sb.ToString();
         }
 

diff --git a/PicView/ImageHandling/SaveImages.cs b/PicView/ImageHandling/SaveImages.cs
@@ -68,5 +68,48 @@ await ConfigureWindows.GetMainWindow.Dispatcher.BeginInvoke(System.Windows.Threa
             catch (Exception) { return false; }
             return true;
         }
+
+        internal static bool SaveImage(Stream? stream, string path, string? destination, int? width, int? height, int? quality, string? ext)
+        {
+            try
+            {
+                using MagickImage magickImage = new();
+
+                if (stream is not null)
+                {
+                    magickImage.Read(stream);
+                }
+                else if (path is not null)
+                {
+                    magickImage.Read(path);
+                }
+                else { return false; }
+
+                if (quality is not null)
+                {
+                    magickImage.Quality = quality.Value;
+                }
+
+                if (width is not null)
+                {
+                    magickImage.Resize(width.Value, 0);
+                }
+                else if (height is not null)
+                {
+                    magickImage.Resize(0, height.Value);
+                }
+
+                if (destination is not null)
+                {
+                    magickImage.Write(ext is not null ? Path.ChangeExtension(destination, ext) : destination);
+                }
+                else
+                {
+                    magickImage.Write(ext is not null ? Path.ChangeExtension(path, ext) : path);
+                }
+            }
+            catch (Exception) { return false; }
+            return true;
+        }
     }
 }
diff --git a/PicView/Views/Windows/ResizeWindow.xaml.cs b/PicView/Views/Windows/ResizeWindow.xaml.cs
@@ -300,6 +300,22 @@ void Loop(CancellationToken cancellationToken)
                 {
                     return;
                 }
+
+                if (running is false)
+                {
+                    cancelToken.Cancel();
+                    if (sourceFileist is not null)
+                    {
+                        sourceFileist.Clear();
+                        sourceFileist = null;
+                    }
+                    Dispatcher.Invoke(DispatcherPriority.ContextIdle, () =>
+                    {
+                        ProgressBar.Value = 0;
+                    });
+                    return;
+                }
+
                 FileInfo fileInfo;
                 lock (sourceFileist)
                 {
@@ -310,12 +326,22 @@ void Loop(CancellationToken cancellationToken)
 
                 for (int x = 0; x < thumbs.Count; x++)
                 {
-                    sb.Append(BatchFunctions.Run(fileInfo, thumbs[x].width, thumbs[x].height, quality, ext, thumbs[x].percentage, compress, thumbs[x].directory, true));
-                }
+                    if (running is false)
+                    {
+                        cancelToken.Cancel();
+                        if (sourceFileist is not null)
+                        {
+                            sourceFileist.Clear();
+                            sourceFileist = null;
+                        }
+                        Dispatcher.Invoke(DispatcherPriority.ContextIdle, () =>
+                        {
+                            ProgressBar.Value = 0;
+                        });
+                        return;
+                    }
 
-                if (running is false)
-                {
-                    cancelToken.Cancel();
+                    sb.Append(BatchFunctions.Run(fileInfo, thumbs[x].width, thumbs[x].height, quality, ext, thumbs[x].percentage, compress, thumbs[x].directory, true));
                 }
 
                 if (cancelToken.IsCancellationRequested)
@@ -327,7 +353,6 @@ void Loop(CancellationToken cancellationToken)
                     }
                     Dispatcher.Invoke(DispatcherPriority.ContextIdle, () =>
                     {
-                        LogTextBox.Text = string.Empty;
                         ProgressBar.Value = 0;
                     });
                     return;