QuickImage – Diff between revs 1 and 2

Subversion Repositories:

?pathlinks?

Rev 1 – Details – Blame – Last modification – View Log

 using System.Threading.Tasks;
 using System.Threading.Tasks.Dataflow;
 using System.Windows.Forms;
 using Configuration;
 using ImageMagick;
+using ImageMagick.Factories;
 using Microsoft.WindowsAPICodePack.Dialogs;
 using MimeDetective.Storage;
 using NetSparkleUpdater;
 using NetSparkleUpdater.Enums;
 using NetSparkleUpdater.SignatureVerifiers;
             _sparkle = new SparkleUpdater("https://quickimage.grimore.org/update/appcast.xml",
                 new Ed25519Checker(SecurityMode.Strict, "LonrgxVjSF0GnY4hzwlRJnLkaxnDn2ikdmOifILzLJY="))
+            {
                 UIFactory = new UIFactory(icon),
                 RelaunchAfterUpdate = true,
-                SecurityProtocolType = SecurityProtocolType.Tls12,
+                //SecurityProtocolType = SecurityProtocolType.Tls12,
-                ShowsUIOnMainThread = false,
+                //ShowsUIOnMainThread = false,
-                LogWriter = new LogWriter(true)
+                LogWriter = new LogWriter(LogWriterOutputMode.None)
             };
             _sparkle.StartLoop(true, true);
             _quickImageDatabase = new QuickImageDatabase(_cancellationToken);
                 try
+                {
                     var mime = await magicMime.GetMimeType(item.Name, cancellationToken);
                     if (Configuration.SupportedFormats.IsSupportedImage(mime))
                     if (Configuration.SupportedFormats.IsSupportedImage(mime))
                         if (!await _tagManager.AddIptcKeywords(item.Name, keywords, cancellationToken))
+                        {
                             progress.Report(new ImageListViewItemProgressFailure<ListViewItem>(item,
                                 new ArgumentException(MethodBase.GetCurrentMethod()?.Name)));
+                            continue;
                             continue;
+                    }
                     if (!await _quickImageDatabase.AddTagsAsync(item.Name, keywords, cancellationToken))
                     catch (Exception exception)
+                    {
                         Log.Error(exception, "Could not identify file.");
+                    }
+                    if (mime == null)
+                    {
+                        continue;
                     if (mime == null) continue;
                     yield return (File: file, Data: memoryStream, Mime: mime.Definition);
                 default:
                     return new Configuration.Configuration();
+            }
+        }
-        private static async Task<Bitmap> CreateThumbnail(Stream file, int width, int height,
+        private static async Task<Bitmap> CreateThumbnail(Stream file, uint width, uint height,
             CancellationToken cancellationToken)
+        {
             using var memoryStream = new MemoryStream();
             using var imageCollection =
             var scaleHeight = width / (float)frame.Height;
             var scaleWidth = height / (float)frame.Width;
             var scale = Math.Min(scaleHeight, scaleWidth);
-            width = (int)(frame.Width * scale);
+            width = (uint)(frame.Width * scale);
-            height = (int)(frame.Height * scale);
+            height = (uint)(frame.Height * scale);
         #endregion
         #region Event Handlers
-        private async void toolStripTextBox1_KeyUp(object sender, KeyEventArgs e)
+        private void toolStripTextBox1_KeyUp(object sender, KeyEventArgs e)
+        {
                             tagListView.BeginUpdate();
                             if (tagListView.Items.ContainsKey(tag))
+                            {
                                 tagListView.Items[tag].Checked = true;
                                 tagListView.EndUpdate();
+                                _sortScheduledContinuation.Schedule(TimeSpan.FromMilliseconds(1000), () =>
+                                {
+                                    tagListView.BeginUpdate();
+                                    tagListView.Sort();
+                                    tagListView.EndUpdate();
+                                }, _formTaskScheduler, _cancellationToken);
                                 continue;
+                            }
                             tagListView.Items.Add(new ListViewItem(tag) { Name = tag });
                             tagListView.Items[tag].Checked = true;
+                            tagListView.EndUpdate();
+                            _sortScheduledContinuation.Schedule(TimeSpan.FromMilliseconds(1000), () =>
+                            {
+                                tagListView.BeginUpdate();
+                                tagListView.Sort();
+                                tagListView.EndUpdate();
-                            tagListView.EndUpdate();
+                            }, _formTaskScheduler, _cancellationToken);
+                        }
                         break;
                     case ImageListViewItemProgressFailure<ListViewItem> imageListViewItemProgressFailure:
                         break;
+            {
                 try
+                {
                     var mime = await _magicMime.GetMimeType(file, _cancellationToken);
+                    if (Configuration.SupportedFormats.IsSupportedVideo(mime))
+                    {
+                        return file;
+                    }
-                    if (Configuration.SupportedFormats.IsSupportedVideo(mime)) return file;
+                    if (!Configuration.SupportedFormats.IsSupportedImage(mime))
+                    {
+                        throw new ArgumentException();
+                    }
-                    if (!Configuration.SupportedFormats.IsSupportedImage(mime)) throw new ArgumentException();
+                    if (!await _tagManager.StripIptcProfile(file, _cancellationToken))
+                    {
+                        throw new ArgumentException();
                     if (!await _tagManager.StripIptcProfile(file, _cancellationToken)) throw new ArgumentException();
+                }
                 catch
+                {
                     this.InvokeIfRequired(form =>
             });
+        }
         private void imageListView_DragOver(object sender, DragEventArgs e)
+        {
+        }
+        private async void nameToolStripMenuItem_Click(object sender, EventArgs e)
+        {
             await SortImageListView(new NameImageListViewItemSorter());
+        }
         private async void ascendingToolStripMenuItem_Click(object sender, EventArgs e)
             // disable menu items not related to list view items
             ToggleMenuItemsRecursive(directoryToolStripMenuItem, MenuItemsToggleOperation.DISABLE);
             ToggleMenuItemsRecursive(fileToolStripMenuItem1, MenuItemsToggleOperation.DISABLE);
             ToggleMenuItemsRecursive(imageToolStripMenuItem, MenuItemsToggleOperation.DISABLE);
             ToggleMenuItemsRecursive(taggingToolStripMenuItem, MenuItemsToggleOperation.DISABLE);
         }
+    }
+}