Merge pull request #3597 from marticliment/better-filtering-and-package-updating

Author: marticliment

src/UniGetUI.Core.Classes/SortableObservableCollection.cs

@@ -14,22 +14,21 @@ public class SortableObservableCollection<T> : ObservableCollection<T> where T :
 
         protected override void OnCollectionChanged(NotifyCollectionChangedEventArgs e)
         {
-            if (!BlockSorting)
-            {
-                base.OnCollectionChanged(e);
-                if (SortingSelector is null
-                    || e.Action == NotifyCollectionChangedAction.Remove
-                    || e.Action == NotifyCollectionChangedAction.Reset)
-                {
-                    return;
-                }
-
-                Sort();
-            }
+            if (BlockSorting)
+                return;
+
+            base.OnCollectionChanged(e);
+            if (SortingSelector is null || e.Action is NotifyCollectionChangedAction.Remove or NotifyCollectionChangedAction.Reset)
+                return;
+
+            Sort();
         }
 
         public void Sort()
         {
+            if (BlockSorting)
+                return;
+
             BlockSorting = true;
 
             if (SortingSelector is null)
@@ -45,7 +44,7 @@ public void Sort()
 
             for (int i = 0; i < Count; i++)
             {
-                this[i].Index = i;
+                this.ElementAt(i).Index = i;
             }
 
             BlockSorting = false;

src/UniGetUI.Core.LanguageEngine/Assets/Data/LanguagesReference.json

@@ -14,6 +14,7 @@
   "es": "Spanish - Castellano",
   "fa": "Persian - فارسی‎",
   "fi": "Finnish - Suomi",
+  "fil": "Filipino - Filipino",
   "fr": "French - Français",
   "gu": "Gujarati - ગુજરાતી",
   "hi": "Hindi - हिंदी",

src/UniGetUI.Core.Tools/Tools.cs

@@ -209,6 +209,7 @@ public static string RandomString(int length)
 
         public static void ReportFatalException(Exception e)
         {
+            Debugger.Break();
             string LangName = "Unknown";
             try
             {

src/UniGetUI.PackageEngine.PackageLoader/AbstractPackageLoader.cs

@@ -4,6 +4,20 @@
 
 namespace UniGetUI.PackageEngine.PackageLoader
 {
+    public class PackagesChangedEvent
+    {
+        public PackagesChangedEvent(bool proceduralChange, IReadOnlyList<IPackage> addedPackages, IReadOnlyList<IPackage> removedPackages)
+        {
+            ProceduralChange = proceduralChange;
+            AddedPackages = addedPackages;
+            RemovedPackages = removedPackages;
+        }
+
+        public readonly bool ProceduralChange;
+        public readonly IReadOnlyList<IPackage> AddedPackages;
+        public readonly IReadOnlyList<IPackage> RemovedPackages;
+    }
+
     public abstract class AbstractPackageLoader
     {
         /// <summary>
@@ -34,7 +48,7 @@ public List<IPackage> Packages
         /// <summary>
         /// Fires when a block of packages (one package or more) is added or removed to the loader
         /// </summary>
-        public event EventHandler<EventArgs>? PackagesChanged;
+        public event EventHandler<PackagesChangedEvent>? PackagesChanged;
 
         /// <summary>
         /// Fires when the loader finishes fetching packages
@@ -85,9 +99,9 @@ public void StopLoading(bool emitFinishSignal = true)
             if (emitFinishSignal) InvokeFinishedLoadingEvent();
         }
 
-        protected void InvokePackagesChangedEvent()
+        protected void InvokePackagesChangedEvent(bool proceduralChange, IReadOnlyList<IPackage> toAdd, IReadOnlyList<IPackage> toRemove)
         {
-            PackagesChanged?.Invoke(this, EventArgs.Empty);
+            PackagesChanged?.Invoke(this, new(proceduralChange, toAdd, toRemove));
         }
 
         protected void InvokeStartedLoadingEvent()
@@ -107,7 +121,7 @@ public virtual async Task ReloadPackages()
         {
             if (DISABLE_RELOAD)
             {
-                InvokePackagesChangedEvent();
+                InvokePackagesChangedEvent(false, [], []);
                 return;
             }
 
@@ -156,7 +170,7 @@ public virtual async Task ReloadPackages()
                                 AddPackage(package);
                                 await WhenAddingPackage(package);
                             }
-                            InvokePackagesChangedEvent();
+                            InvokePackagesChangedEvent(true, task.Result.ToArray(), []);
                         }
                         tasks.Remove(task);
                     }
@@ -180,7 +194,7 @@ public void ClearPackages(bool emitFinishSignal = true)
             PackageReference.Clear();
             IsLoaded = false;
             IsLoading = false;
-            InvokePackagesChangedEvent();
+            InvokePackagesChangedEvent(false, [], []);
         }
 
         /// <summary>
@@ -245,7 +259,7 @@ public void AddForeign(IPackage? package)
             }
 
             AddPackage(package);
-            InvokePackagesChangedEvent();
+            InvokePackagesChangedEvent(true, [package], []);
         }
 
         /// <summary>
@@ -264,7 +278,7 @@ public void Remove(IPackage? package)
             }
 
             PackageReference.Remove(HashPackage(package), out IPackage? _);
-            InvokePackagesChangedEvent();
+            InvokePackagesChangedEvent(true, [], [package]);
         }
 
         /// <summary>

src/UniGetUI.PackageEngine.PackageLoader/InstalledPackagesLoader.cs

@@ -82,7 +82,7 @@ public async Task ReloadPackagesSilently()
                                     await WhenAddingPackage(package);
                                 }
                             }
-                            InvokePackagesChangedEvent();
+                            InvokePackagesChangedEvent(true, task.Result.ToArray(), []);
                         }
                         tasks.Remove(task);
                     }

src/UniGetUI.PackageEngine.PackageLoader/PackageBundlesLoader.cs

@@ -73,7 +73,7 @@ public async Task AddPackagesAsync(IReadOnlyList<IPackage> foreign_packages)
                 }
                 if (package is not null && !Contains(package)) AddPackage(package);
             }
-            InvokePackagesChangedEvent();
+            InvokePackagesChangedEvent(true, foreign_packages, []);
         }
 
         public void RemoveRange(IReadOnlyList<IPackage> packages)
@@ -83,7 +83,7 @@ public void RemoveRange(IReadOnlyList<IPackage> packages)
                 if (!Contains(package)) continue;
                 PackageReference.Remove(HashPackage(package), out IPackage? _);
             }
-            InvokePackagesChangedEvent();
+            InvokePackagesChangedEvent(true, [], packages);
         }
     }
 }

src/UniGetUI/CLIHandler.cs

@@ -8,6 +8,8 @@ public static class CLIHandler
     public const string HELP = "--help";
     public const string DAEMON = "--daemon";
     public const string MIGRATE_WINGETUI_TO_UNIGETUI = "--migrate-wingetui-to-unigetui";
+    public const string UNINSTALL_WINGETUI = "--uninstall-wingetui";
+    public const string UNINSTALL_UNIGETUI = "--uninstall-unigetui";
 
     public const string IMPORT_SETTINGS = "--import-settings";
     public const string EXPORT_SETTINGS = "--export-settings";
@@ -221,4 +223,10 @@ public static int WingetUIToUniGetUIMigrator()
             return ex.HResult;
         }
     }
+
+    public static int UninstallUniGetUI()
+    {
+        // There is currently no uninstall logic. However, this needs to be maintained, or otherwhise UniGetUI will launch on uninstall
+        return 0;
+    }
 }

src/UniGetUI/Controls/ObservablePackageCollection.cs

@@ -1,5 +1,4 @@
 using UniGetUI.Core.Classes;
-using UniGetUI.Interface;
 using UniGetUI.PackageEngine.Interfaces;
 
 namespace UniGetUI.PackageEngine.PackageClasses
@@ -26,14 +25,22 @@ public ObservablePackageCollection()
             SortingSelector = x => x.Package.Name;
         }
 
-        /// <summary>
-        /// Add a package to the collection
-        /// </summary>
-        public void Add(IPackage p, AbstractPackagesPage page)
+        public void FromRange(IReadOnlyList<PackageWrapper> packages)
         {
-            base.Add(new PackageWrapper(p, page));
+            BlockSorting = true;
+
+            // Clear the list
+            Clear();
+
+            // Add all packages
+            foreach (var w in packages)
+                Add(w);
+
+            BlockSorting = false;
+            Sort();
         }
 
+
         /// <summary>
         /// Sets the property with which to filter the package and sorts the collection
         /// </summary>
@@ -120,7 +127,7 @@ public void SelectAll()
         {
             foreach (PackageWrapper wrapper in this)
             {
-                wrapper.Package.IsChecked = true;
+                wrapper.IsChecked = true;
             }
         }
 
@@ -131,7 +138,7 @@ public void ClearSelection()
         {
             foreach (PackageWrapper wrapper in this)
             {
-                wrapper.Package.IsChecked = false;
+                wrapper.IsChecked = false;
             }
         }
     }

src/UniGetUI/Controls/PackageWrapper.cs

@@ -27,7 +27,11 @@ public static void ResetIconCache()
         public bool IsChecked
         {
             get => Package.IsChecked;
-            set => Package.IsChecked = value;
+            set
+            {
+                Package.IsChecked = value;
+                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsChecked)));
+            }
         }
 
         public bool IconWasLoaded;

src/UniGetUI/EntryPoint.cs

@@ -24,6 +24,11 @@ private static void Main(string[] args)
                     int ret = CLIHandler.WingetUIToUniGetUIMigrator();
                     Environment.Exit(ret);
                 }
+                else if (args.Contains(CLIHandler.UNINSTALL_UNIGETUI) || args.Contains(CLIHandler.UNINSTALL_WINGETUI))
+                {
+                    int ret = CLIHandler.UninstallUniGetUI();
+                    Environment.Exit(ret);
+                }
                 else if (args.Contains(CLIHandler.IMPORT_SETTINGS))
                 {
                     int ret = CLIHandler.ImportSettings();