Remove DisabledProgramSource

Author: VictoriousRaptor

Plugins/Flow.Launcher.Plugin.Program/Main.cs

@@ -192,9 +192,9 @@ private static void DisableProgram(IProgram programToDelete)
 
             if (_uwps.Any(x => x.UniqueIdentifier == programToDelete.UniqueIdentifier))
             {
-                _uwps.First(x => x.UniqueIdentifier == programToDelete.UniqueIdentifier)
-                     .Enabled = false;
-                _settings.DisabledProgramSources.Add(new DisabledProgramSource(programToDelete));
+                var program = _uwps.First(x => x.UniqueIdentifier == programToDelete.UniqueIdentifier);
+                program.Enabled = false;
+                _settings.DisabledProgramSources.Add(new ProgramSource(program));
                 _ = Task.Run(() =>
                 {
                     IndexUwpPrograms();
@@ -203,9 +203,9 @@ private static void DisableProgram(IProgram programToDelete)
             }
             else if (_win32s.Any(x => x.UniqueIdentifier == programToDelete.UniqueIdentifier))
             {
-                _win32s.First(x => x.UniqueIdentifier == programToDelete.UniqueIdentifier)
-                    .Enabled = false;
-                _settings.DisabledProgramSources.Add(new DisabledProgramSource(programToDelete));
+                var program = _win32s.First(x => x.UniqueIdentifier == programToDelete.UniqueIdentifier);
+                program.Enabled = false;
+                _settings.DisabledProgramSources.Add(new ProgramSource(program));
                 _ = Task.Run(() =>
                 {
                     IndexWin32Programs();

Plugins/Flow.Launcher.Plugin.Program/Settings.cs

@@ -9,7 +9,7 @@ public class Settings
     {
         public DateTime LastIndexTime { get; set; }
         public List<ProgramSource> ProgramSources { get; set; } = new List<ProgramSource>();
-        public List<DisabledProgramSource> DisabledProgramSources { get; set; } = new List<DisabledProgramSource>();  // For disabled single programs
+        public List<ProgramSource> DisabledProgramSources { get; set; } = new List<ProgramSource>();  // For disabled single programs
         public string[] ProgramSuffixes { get; set; } = {"appref-ms", "exe", "lnk"};
 
         public bool EnableStartMenuSource { get; set; } = true;

Plugins/Flow.Launcher.Plugin.Program/Views/Commands/ProgramSettingDisplay.cs

@@ -14,7 +14,6 @@ internal static List<ProgramSource> LoadProgramSources()
             // Even though these are disabled, we still want to display them so users can enable later on
             return Main._settings
                        .DisabledProgramSources
-                       .Select(s => new ProgramSource(s))
                        .Union(Main._settings.ProgramSources)
                        .ToList();
         }
@@ -62,8 +61,7 @@ internal static void StoreDisabledInSettings()
             var tmp = ProgramSetting.ProgramSettingDisplayList
                 .Where(t1 => !t1.Enabled
                                 && !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.ProgramSources.Any(x => x.UniqueIdentifier == t1.UniqueIdentifier));
 
             Main._settings.DisabledProgramSources.AddRange(tmp);
         }
@@ -76,7 +74,7 @@ internal static void RemoveDisabledFromSettings()
             //   .ForEach(t1 => t1.Enabled = true);
 
             Main._settings.DisabledProgramSources
-                .RemoveAll(t1 => ProgramSetting.ProgramSettingDisplayList.Any(x => x.UniqueIdentifier == t1.UniqueIdentifier && x.Enabled));
+                .RemoveAll(t1 => t1.Enabled);
         }
 
         internal static bool IsReindexRequired(this List<ProgramSource> selectedItems)

Plugins/Flow.Launcher.Plugin.Program/Views/Models/ProgramSource.cs

@@ -83,22 +83,4 @@ public void SetLocation(string value)
             UniqueIdentifier = value.ToLowerInvariant();  // Update
         }
     }
-
-    public class DisabledProgramSource : ProgramSource
-    {
-        [JsonConstructor]
-        public DisabledProgramSource(string name, string location, bool enabled, string uniqueIdentifier) : base(name, location, enabled, uniqueIdentifier) { }
-
-        public DisabledProgramSource(string location) : base(location, false) { }
-
-        public DisabledProgramSource(ProgramSource source) : base(source)
-        {
-            Enabled = false;
-        }
-
-        public DisabledProgramSource(IProgram program) : base(program)
-        {
-            Enabled = false;
-        }
-    }
 }