bugfix and refactor

VictoriousRaptor · VictoriousRaptor · commit 874383bd076d · 2022-10-25T17:39:01.000+08:00
1. Fix issues with uid. 2. Implement Flow-Launcher#1486.
diff --git a/Plugins/Flow.Launcher.Plugin.Program/AddProgramSource.xaml.cs b/Plugins/Flow.Launcher.Plugin.Program/AddProgramSource.xaml.cs
@@ -55,6 +55,7 @@ private void BtnCancel_OnClick(object sender, RoutedEventArgs e)
         private void BtnAdd_OnClick(object sender, RoutedEventArgs e)
         {
             string path = Directory.Text;
+            bool modified = false;
             if (!System.IO.Directory.Exists(path))
             {
                 System.Windows.MessageBox.Show(_context.API.GetTranslation("flowlauncher_plugin_program_invalid_path"));
@@ -65,18 +66,22 @@ private void BtnAdd_OnClick(object sender, RoutedEventArgs e)
                 if (!ProgramSetting.ProgramSettingDisplayList.Any(x => x.UniqueIdentifier.Equals(path, System.StringComparison.InvariantCultureIgnoreCase)))
                 {
                     var source = new ProgramSource(path);
-
+                    modified = true;
                     _settings.ProgramSources.Insert(0, source);
                     ProgramSetting.ProgramSettingDisplayList.Add(source);
                 }
             }
             else
             {
-                _editing.Location = path;
-                _editing.Enabled = Chkbox.IsChecked ?? true;  // Fixme, need to add to disabled source if not custom source
+                modified = _editing.Location != path || _editing.Enabled != Chkbox.IsChecked;
+                if (modified)
+                {
+                    _editing.SetLocation(path);
+                    _editing.Enabled = Chkbox.IsChecked ?? true;
+                }
             }
 
-            DialogResult = true;
+            DialogResult = modified;
             Close();
         }
     }
diff --git a/Plugins/Flow.Launcher.Plugin.Program/Main.cs b/Plugins/Flow.Launcher.Plugin.Program/Main.cs
@@ -197,7 +197,7 @@ private static void DisableProgram(IProgram programToDelete)
                 _settings.DisabledProgramSources.Add(new DisabledProgramSource(programToDelete));
                 var t1 = Task.Run(() =>
                 {
-                    IndexWin32Programs();
+                    IndexUwpPrograms();
                     _settings.LastIndexTime = DateTime.Today;
                 });
             }
@@ -208,7 +208,7 @@ private static void DisableProgram(IProgram programToDelete)
                 _settings.DisabledProgramSources.Add(new DisabledProgramSource(programToDelete));
                 var t1 = Task.Run(() =>
                 {
-                    IndexUwpPrograms();
+                    IndexWin32Programs();
                     _settings.LastIndexTime = DateTime.Today;
                 });
             }
diff --git a/Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs b/Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs
@@ -25,7 +25,7 @@ namespace Flow.Launcher.Plugin.Program.Programs
     public class Win32 : IProgram, IEquatable<Win32>
     {
         public string Name { get; set; }
-        public string UniqueIdentifier { get => _uid; set => _uid = value.ToLowerInvariant(); }
+        public string UniqueIdentifier { get => _uid; set => _uid = value.ToLowerInvariant(); }  // For path comparison
         public string IcoPath { get; set; }
         public string FullPath { get; set; }
         public string LnkResolvedPath { get; set; }
diff --git a/Plugins/Flow.Launcher.Plugin.Program/Views/Commands/ProgramSettingDisplay.cs b/Plugins/Flow.Launcher.Plugin.Program/Views/Commands/ProgramSettingDisplay.cs
@@ -52,30 +52,31 @@ internal static void SetProgramSourcesStatus(List<ProgramSource> selectedProgram
 
         internal static void StoreDisabledInSettings()
         {
-            Main._settings.ProgramSources
-               .Where(t1 => ProgramSetting.ProgramSettingDisplayList.Any(x => x.UniqueIdentifier == t1.UniqueIdentifier && !x.Enabled))
-               .ToList()
-               .ForEach(t1 => t1.Enabled = false);
+            // no need since using refernce now
+            //Main._settings.ProgramSources
+            //   .Where(t1 => ProgramSetting.ProgramSettingDisplayList.Any(x => x.UniqueIdentifier == t1.UniqueIdentifier && !x.Enabled))
+            //   .ToList()
+            //   .ForEach(t1 => t1.Enabled = false);
 
-            ProgramSetting.ProgramSettingDisplayList
+            // Disabled, not in DisabledProgramSources or ProgramSources
+            var tmp = ProgramSetting.ProgramSettingDisplayList
                 .Where(t1 => !t1.Enabled
-                                && !Main._settings.DisabledProgramSources.Any(x => x.UniqueIdentifier == t1.UniqueIdentifier))
-                .ToList()
-                .ForEach(x => Main._settings.DisabledProgramSources
-                                            .Add(new DisabledProgramSource(x)));
+                                && !Main._settings.DisabledProgramSources.Any(x => x.UniqueIdentifier == t1.UniqueIdentifier)
+                                && !Main._settings.ProgramSources.Any(x => x.UniqueIdentifier == t1.UniqueIdentifier))
+                .Select(x => new DisabledProgramSource(x));
+
+            Main._settings.DisabledProgramSources.AddRange(tmp);
         }
 
         internal static void RemoveDisabledFromSettings()
         {
-            Main._settings.ProgramSources
-               .Where(t1 => ProgramSetting.ProgramSettingDisplayList.Any(x => x.UniqueIdentifier == t1.UniqueIdentifier && x.Enabled))
-               .ToList()
-               .ForEach(t1 => t1.Enabled = true);
+            //Main._settings.ProgramSources
+            //   .Where(t1 => ProgramSetting.ProgramSettingDisplayList.Any(x => x.UniqueIdentifier == t1.UniqueIdentifier && x.Enabled))
+            //   .ToList()
+            //   .ForEach(t1 => t1.Enabled = true);
 
             Main._settings.DisabledProgramSources
-                .Where(t1 => ProgramSetting.ProgramSettingDisplayList.Any(x => x.UniqueIdentifier == t1.UniqueIdentifier && x.Enabled))
-                .ToList()
-                .ForEach(x => Main._settings.DisabledProgramSources.Remove(x));
+                .RemoveAll(t1 => ProgramSetting.ProgramSettingDisplayList.Any(x => x.UniqueIdentifier == t1.UniqueIdentifier && x.Enabled));
         }
 
         internal static bool IsReindexRequired(this List<ProgramSource> selectedItems)
diff --git a/Plugins/Flow.Launcher.Plugin.Program/Views/Models/ProgramSource.cs b/Plugins/Flow.Launcher.Plugin.Program/Views/Models/ProgramSource.cs
@@ -1,5 +1,7 @@
 ﻿using System;
 using System.IO;
+using System.Text.Json.Serialization;
+using System.Windows.Media.Imaging;
 using Flow.Launcher.Plugin.Program.Programs;
 
 namespace Flow.Launcher.Plugin.Program.Views.Models
@@ -16,17 +18,20 @@ public class ProgramSource
     {
         private string name;
 
-        public string Location { get; set; }
+        public string Location { get; private set; }
         public string Name { get => name ?? new DirectoryInfo(Location).Name; set => name = value; }
         public bool Enabled { get; set; } = true;
 
-        /// <summary>
-        /// Guaranteed lowercase.
-        /// </summary>
-        public string UniqueIdentifier { get => uid; set => uid = value.ToLowerInvariant(); }
-        private string uid { get; set; }
+        public string UniqueIdentifier { get; private set; }
 
-        public ProgramSource() { }  // only for json deserialization
+        [JsonConstructor]
+        public ProgramSource(string name, string location, bool enabled, string uniqueIdentifier)
+        {
+            Location = location;
+            this.name = name;
+            Enabled = enabled;
+            UniqueIdentifier = uniqueIdentifier;
+        }
 
         /// <summary>
         /// Add source by location
@@ -37,7 +42,7 @@ public ProgramSource(string location, bool enabled=true)
         {
             Location = location;
             Enabled = enabled;
-            UniqueIdentifier = location;
+            UniqueIdentifier = location.ToLowerInvariant();  // For path comparison
         }
 
         public ProgramSource(ProgramSource source)
@@ -68,13 +73,21 @@ public bool Equals(IProgram program)
 
         public override int GetHashCode()
         {
-            return HashCode.Combine(uid);
+            return HashCode.Combine(UniqueIdentifier);
+        }
+
+        public void SetLocation(string value)
+        {
+            if (Location == value) return;
+            Location = value;
+            UniqueIdentifier = value.ToLowerInvariant();  // Update
         }
     }
 
     public class DisabledProgramSource : ProgramSource
     {
-        public DisabledProgramSource() { }  // only for json deserialization
+        [JsonConstructor]
+        public DisabledProgramSource(string name, string location, bool enabled, string uniqueIdentifier) : base(name, location, enabled, uniqueIdentifier) { }
 
         public DisabledProgramSource(string location) : base(location, false) { }
 
diff --git a/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml.cs b/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml.cs
@@ -149,19 +149,34 @@ private void DeleteProgramSources(List<ProgramSource> itemsToDelete)
         private void btnEditProgramSource_OnClick(object sender, RoutedEventArgs e)
         {
             var selectedProgramSource = programSourceView.SelectedItem as ProgramSource;
-            if (selectedProgramSource != null)
+            EditProgramSource(selectedProgramSource);
+        }
+
+        private void EditProgramSource(ProgramSource selectedProgramSource)
+        {
+            if (selectedProgramSource == null)
+            {
+                string msg = context.API.GetTranslation("flowlauncher_plugin_program_pls_select_program_source");
+                MessageBox.Show(msg);
+            }
+            else
             {
                 var add = new AddProgramSource(selectedProgramSource, _settings);
                 if (add.ShowDialog() ?? false)
                 {
+                    if (selectedProgramSource.Enabled)
+                    {
+                        ProgramSettingDisplay.SetProgramSourcesStatus(new List<ProgramSource> { selectedProgramSource }, true);  // sync status in win32, uwp and disabled
+                        ProgramSettingDisplay.RemoveDisabledFromSettings();
+                    }
+                    else
+                    {
+                        ProgramSettingDisplay.SetProgramSourcesStatus(new List<ProgramSource> { selectedProgramSource }, false);
+                        ProgramSettingDisplay.StoreDisabledInSettings();
+                    }
                     ReIndexing();
                 }
             }
-            else
-            {
-                string msg = context.API.GetTranslation("flowlauncher_plugin_program_pls_select_program_source");
-                MessageBox.Show(msg);
-            }
         }
 
         private void btnReindex_Click(object sender, RoutedEventArgs e)
@@ -352,14 +367,7 @@ private void programSourceView_SelectionChanged(object sender, SelectionChangedE
         private void programSourceView_MouseDoubleClick(object sender, MouseButtonEventArgs e)
         {
             var selectedProgramSource = programSourceView.SelectedItem as ProgramSource;
-            if (selectedProgramSource != null)
-            { 
-                var add = new AddProgramSource(selectedProgramSource, _settings);
-                if (add.ShowDialog() ?? false)
-                {
-                    ReIndexing();
-                }
-            }
+            EditProgramSource(selectedProgramSource);
         }
 
         private bool IsAllItemsUserAdded(List<ProgramSource> items)

Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,7 @@ private void BtnCancel_OnClick(object sender, RoutedEventArgs e)`
`55`	`55`	`private void BtnAdd_OnClick(object sender, RoutedEventArgs e)`
`56`	`56`	`{`
`57`	`57`	`string path = Directory.Text;`
	`58`	`+ bool modified = false;`
`58`	`59`	`if (!System.IO.Directory.Exists(path))`
`59`	`60`	`{`
`60`	`61`	`System.Windows.MessageBox.Show(_context.API.GetTranslation("flowlauncher_plugin_program_invalid_path"));`
`@@ -65,18 +66,22 @@ private void BtnAdd_OnClick(object sender, RoutedEventArgs e)`
`65`	`66`	`if (!ProgramSetting.ProgramSettingDisplayList.Any(x => x.UniqueIdentifier.Equals(path, System.StringComparison.InvariantCultureIgnoreCase)))`
`66`	`67`	`{`
`67`	`68`	`var source = new ProgramSource(path);`
`68`		`-`
	`69`	`+ modified = true;`
`69`	`70`	`_settings.ProgramSources.Insert(0, source);`
`70`	`71`	`ProgramSetting.ProgramSettingDisplayList.Add(source);`
`71`	`72`	`}`
`72`	`73`	`}`
`73`	`74`	`else`
`74`	`75`	`{`
`75`		`- _editing.Location = path;`
`76`		`- _editing.Enabled = Chkbox.IsChecked ?? true; // Fixme, need to add to disabled source if not custom source`
	`76`	`+ modified = _editing.Location != path \|\| _editing.Enabled != Chkbox.IsChecked;`
	`77`	`+ if (modified)`
	`78`	`+ {`
	`79`	`+ _editing.SetLocation(path);`
	`80`	`+ _editing.Enabled = Chkbox.IsChecked ?? true;`
	`81`	`+ }`
`77`	`82`	`}`
`78`	`83`
`79`		`- DialogResult = true;`
	`84`	`+ DialogResult = modified;`
`80`	`85`	`Close();`
`81`	`86`	`}`
`82`	`87`	`}`
Original file line number	Diff line number	Diff line change
`@@ -197,7 +197,7 @@ private static void DisableProgram(IProgram programToDelete)`
`197`	`197`	`_settings.DisabledProgramSources.Add(new DisabledProgramSource(programToDelete));`
`198`	`198`	`var t1 = Task.Run(() =>`
`199`	`199`	`{`
`200`		`- IndexWin32Programs();`
	`200`	`+ IndexUwpPrograms();`
`201`	`201`	`_settings.LastIndexTime = DateTime.Today;`
`202`	`202`	`});`
`203`	`203`	`}`
`@@ -208,7 +208,7 @@ private static void DisableProgram(IProgram programToDelete)`
`208`	`208`	`_settings.DisabledProgramSources.Add(new DisabledProgramSource(programToDelete));`
`209`	`209`	`var t1 = Task.Run(() =>`
`210`	`210`	`{`
`211`		`- IndexUwpPrograms();`
	`211`	`+ IndexWin32Programs();`
`212`	`212`	`_settings.LastIndexTime = DateTime.Today;`
`213`	`213`	`});`
`214`	`214`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ namespace Flow.Launcher.Plugin.Program.Programs`
`25`	`25`	`public class Win32 : IProgram, IEquatable<Win32>`
`26`	`26`	`{`
`27`	`27`	`public string Name { get; set; }`
`28`		`- public string UniqueIdentifier { get => _uid; set => _uid = value.ToLowerInvariant(); }`
	`28`	`+ public string UniqueIdentifier { get => _uid; set => _uid = value.ToLowerInvariant(); } // For path comparison`
`29`	`29`	`public string IcoPath { get; set; }`
`30`	`30`	`public string FullPath { get; set; }`
`31`	`31`	`public string LnkResolvedPath { get; set; }`