fix updating original file during image processing [#54], fix global …

…task not being set [#49], sort items by index after image processing, update index for pages
t0815 · Oct 9, 2024 · f175dcf · f175dcf
1 parent e9e8d45
commit f175dcf
Show file tree

Hide file tree

Showing 10 changed files with 420 additions and 202 deletions.
diff --git a/MyCBZ/Events/UpdatePageListViewSortingEvent.cs b/MyCBZ/Events/UpdatePageListViewSortingEvent.cs
@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace Win_CBZ.Events
+{
+    internal class UpdatePageListViewSortingEvent
+    {
+        public int SortColumn { get; set; } = 1;   // sort by index by default
+
+        public SortOrder Order { get; set; } = SortOrder.Ascending;
+
+        public UpdatePageListViewSortingEvent() { }
+
+        public UpdatePageListViewSortingEvent(int column, SortOrder order)
+        {
+            SortColumn = column;
+            Order = order;
+        }
+    }
+}
diff --git a/MyCBZ/Events/UpdateThumbnailsEvent.cs b/MyCBZ/Events/UpdateThumbnailsEvent.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Win_CBZ.Events
+{
+    class UpdateThumbnailsEvent
+    {
+            public List<Page> Pages { get; set; }
+
+            public UpdateThumbnailsEvent() { }
+
+            public UpdateThumbnailsEvent(List<Page> pages)
+            {
+                this.Pages = pages;
+            }
+    }
+}
diff --git a/MyCBZ/Extensions/ListBoxExtensions.cs b/MyCBZ/Extensions/ListBoxExtensions.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.Versioning;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Documents;
+using System.Windows.Forms;
+
+namespace Win_CBZ.Extensions
+{
+    [SupportedOSPlatform("windows")]
+    public static class ListBoxExtensions
+    {
+        public static void Sort(this ListBox lb, SortOrder order = SortOrder.Ascending)
+        {
+            var list = lb.Items.Cast<Page>().ToArray();
+            list = order == SortOrder.Descending
+                        ? list.OrderByDescending(x => x.Index).ToArray()
+                        : list.OrderBy(x => x.Index).ToArray();
+            lb.Items.Clear();
+            lb.Items.AddRange(list);
+        }
+    }
+}
diff --git a/MyCBZ/Forms/MainForm.cs b/MyCBZ/Forms/MainForm.cs
@@ -31,6 +31,8 @@
 using Win_CBZ.Properties;
 using System.Drawing.Drawing2D;
 using Microsoft.VisualBasic.Devices;
+using Win_CBZ.Extensions;
+using Win_CBZ.List;
 
 namespace Win_CBZ
 {
@@ -271,7 +273,9 @@ private ProjectModel NewProjectModel()
             AppEventHandler.GlobalActionRequired += HandleGlobalActionRequired;
             AppEventHandler.GeneralTaskProgress += HandleGlobalTaskProgress;
             AppEventHandler.RedrawThumbnail += HandleRedrawThumbnail;
+            AppEventHandler.UpdateThumbnails += HandleUpdateThumbnails;
             AppEventHandler.ImageAdjustmentsChanged += HandleImageAdjustmentsChanged;
+            AppEventHandler.UpdateListViewSorting += HandleListviewSorting;
 
             newProjectModel.RenameStoryPagePattern = Win_CBZSettings.Default.StoryPageRenamePattern;
             newProjectModel.RenameSpecialPagePattern = Win_CBZSettings.Default.SpecialPageRenamePattern;
@@ -1181,15 +1185,65 @@ private void HandleRedrawThumbnail(object sender, RedrawThumbEvent e)
                             PageImages.Images.RemoveByKey(e.Page.Id);
                         }
                         PageThumbsListBox.Items[pageIndex] = e.Page;
-
-
                     }
                     PageThumbsListBox.Invalidate();
                     PageThumbsListBox.Refresh();
                 }));
             }
         }
 
+        private void HandleUpdateThumbnails(object sender, UpdateThumbnailsEvent e)
+        {
+            if (!WindowClosed)
+            {
+                Invoke(new Action(() =>
+                {
+                    if (e.Pages != null && e.Pages.Count > 0)
+                    {
+                        foreach (Page p in e.Pages)
+                        {
+                            p.Invalidated = true;
+                            int pageIndex = PageThumbsListBox.Items.IndexOf(Program.ProjectModel.GetPageById(p.Id));
+                            if (pageIndex > -1)
+                            {
+                                if (PageImages.Images.ContainsKey(p.Id))
+                                {
+                                    PageImages.Images.RemoveByKey(p.Id);
+                                }
+                                PageThumbsListBox.Items[pageIndex] = p;
+                            }
+                        }
+                        PageThumbsListBox.Invalidate();
+                        PageThumbsListBox.Refresh();
+                    }
+                }));
+            }
+        }
+
+        private void HandleListviewSorting(object sender, UpdatePageListViewSortingEvent e)
+        {
+            if (!WindowClosed)
+            {
+                Invoke(() =>
+                {
+                    Program.ProjectModel.Pages.Sort((x, y) => x.Index.CompareTo(y.Index));
+
+                    PagesList.ListViewItemSorter = new ListViewSorter(e.SortColumn);
+
+                    PagesList.Sorting = e.Order;
+                    PagesList.Sort();
+                    PagesList.Sorting = SortOrder.None;
+
+                    if (Win_CBZSettings.Default.PagePreviewEnabled)
+                    {
+                        PageThumbsListBox.Sort(e.Order);
+                    }
+
+
+                });
+            }
+        }
+
         public void ReloadPreviewThumbs()
         {
             if (!WindowClosed)
@@ -4693,10 +4747,9 @@ private void PagesList_ItemSelectionChanged(object sender, ListViewItemSelection
                     LabelH.Text = ((Page)selectedPages[0].Tag).Format.H.ToString();
                 }
 
-                selectedImageTasks = ((Page)selectedPages[0].Tag).ImageTask;
-
                 if (RadioApplyAdjustmentsPage.Checked && ((String)RadioApplyAdjustmentsPage.Tag) != ((Page)selectedPages[0].Tag).Id)
                 {
+                    selectedImageTasks = ((Page)selectedPages[0].Tag).ImageTask;
                     UpdateImageAdjustments(sender, ((Page)selectedPages[0].Tag).Id, true);
                 }