Instead of migrating the UseSystemChocolatey setting, the toggle can be added by not adding the local executable as the first one, so the default file will be pulled from path

Author: marticliment

src/UniGetUI.Core.Settings/SettingsEngine_Names.cs

@@ -75,7 +75,6 @@ public enum K
         DisableSuccessNotifications,
         DisableProgressNotifications,
         KillProcessesThatRefuseToDie,
-        TransferredSystemChocolatey,
         ManagerPaths,
 
         Test1,
@@ -163,7 +162,6 @@ public static string ResolveKey(K key)
             K.DisableSuccessNotifications => "DisableSuccessNotifications",
             K.DisableProgressNotifications => "DisableProgressNotifications",
             K.KillProcessesThatRefuseToDie => "KillProcessesThatRefuseToDie",
-            K.TransferredSystemChocolatey => "TransferredSystemChocolatey",
             K.ManagerPaths => "ManagerPaths",
 
             K.Test1 => "TestSetting1",

src/UniGetUI.PackageEngine.Managers.Chocolatey/Chocolatey.cs

@@ -18,8 +18,10 @@ namespace UniGetUI.PackageEngine.Managers.ChocolateyManager
 {
     public class Chocolatey : BaseNuGet
     {
-        public static new string[] FALSE_PACKAGE_IDS = ["Directory", "", "Did", "Features?", "Validation", "-", "being", "It", "Error", "L'accs", "Maximum", "This", "Output is package name ", "operable", "Invalid"];
-        public static new string[] FALSE_PACKAGE_VERSIONS = ["", "of", "Did", "Features?", "Validation", "-", "being", "It", "Error", "L'accs", "Maximum", "This", "packages", "current version", "installed version", "is", "program", "validations", "argument", "no"];
+        public static readonly string[] FALSE_PACKAGE_IDS = ["Directory", "", "Did", "Features?", "Validation", "-", "being", "It", "Error", "L'accs", "Maximum", "This", "Output is package name ", "operable", "Invalid"];
+        public static readonly string[] FALSE_PACKAGE_VERSIONS = ["", "of", "Did", "Features?", "Validation", "-", "being", "It", "Error", "L'accs", "Maximum", "This", "packages", "current version", "installed version", "is", "program", "validations", "argument", "no"];
+        private static readonly string OldChocoPath = Path.Join(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "Programs\\WingetUI\\choco-cli");
+        private static readonly string NewChocoPath = Path.Join(CoreData.UniGetUIDataDirectory, "Chocolatey");
 
         public Chocolatey()
         {
@@ -189,29 +191,25 @@ protected override IReadOnlyList<Package> _getInstalledPackages_UnSafe()
             return Packages;
         }
 
-        private static readonly string old_choco_path = Path.Join(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "Programs\\WingetUI\\choco-cli");
-        private static readonly string new_choco_path = Path.Join(CoreData.UniGetUIDataDirectory, "Chocolatey");
-
         public override IReadOnlyList<string> FindCandidateExecutableFiles()
         {
-            List<string> ChocoPaths = [];
-
-            var SystemPaths = CoreTools.WhichMultiple("choco");
-            if (SystemPaths.Any()) foreach (var Path in SystemPaths) ChocoPaths.Add(Path);
-            if (File.Exists(Path.Join(new_choco_path, "choco.exe"))) ChocoPaths.Add(Path.Join(new_choco_path, "choco.exe"));
-            string EnvPath = Path.Join(Environment.GetEnvironmentVariable("ChocolateyInstall"), "choco.exe");
-            if (File.Exists(EnvPath)) ChocoPaths.Add(EnvPath);
+            List<string> candidates = [];
 
-            return ChocoPaths;
+            if (!Settings.Get(Settings.K.UseSystemChocolatey))
+            {
+                candidates.Add(Path.Join(NewChocoPath, "choco.exe"));
+            }
+            candidates.AddRange(CoreTools.WhichMultiple("choco.exe"));
+            return candidates;
         }
 
         protected override ManagerStatus LoadManager()
         {
-            if (!Directory.Exists(old_choco_path))
+            if (!Directory.Exists(OldChocoPath))
             {
                 Logger.Debug("Old chocolatey path does not exist, not migrating Chocolatey");
             }
-            else if (CoreTools.IsSymbolicLinkDir(old_choco_path))
+            else if (CoreTools.IsSymbolicLinkDir(OldChocoPath))
             {
                 Logger.ImportantInfo("Old chocolatey path is a symbolic link, not migrating Chocolatey...");
             }
@@ -227,20 +225,20 @@ protected override ManagerStatus LoadManager()
 
                     string current_env_var =
                         Environment.GetEnvironmentVariable("chocolateyinstall", EnvironmentVariableTarget.User) ?? "";
-                    if (current_env_var != "" && Path.GetRelativePath(current_env_var, old_choco_path) == ".")
+                    if (current_env_var != "" && Path.GetRelativePath(current_env_var, OldChocoPath) == ".")
                     {
                         Logger.ImportantInfo("Migrating ChocolateyInstall environment variable to new location");
-                        Environment.SetEnvironmentVariable("chocolateyinstall", new_choco_path, EnvironmentVariableTarget.User);
+                        Environment.SetEnvironmentVariable("chocolateyinstall", NewChocoPath, EnvironmentVariableTarget.User);
                     }
 
-                    if (!Directory.Exists(new_choco_path))
+                    if (!Directory.Exists(NewChocoPath))
                     {
-                        Directory.CreateDirectory(new_choco_path);
+                        Directory.CreateDirectory(NewChocoPath);
                     }
 
-                    foreach (string old_subdir in Directory.GetDirectories(old_choco_path, "*", SearchOption.AllDirectories))
+                    foreach (string old_subdir in Directory.GetDirectories(OldChocoPath, "*", SearchOption.AllDirectories))
                     {
-                        string new_subdir = old_subdir.Replace(old_choco_path, new_choco_path);
+                        string new_subdir = old_subdir.Replace(OldChocoPath, NewChocoPath);
                         if (!Directory.Exists(new_subdir))
                         {
                             Logger.Debug("New directory: " + new_subdir);
@@ -252,9 +250,9 @@ protected override ManagerStatus LoadManager()
                         }
                     }
 
-                    foreach (string old_file in Directory.GetFiles(old_choco_path, "*", SearchOption.AllDirectories))
+                    foreach (string old_file in Directory.GetFiles(OldChocoPath, "*", SearchOption.AllDirectories))
                     {
-                        string new_file = old_file.Replace(old_choco_path, new_choco_path);
+                        string new_file = old_file.Replace(OldChocoPath, NewChocoPath);
                         if (!File.Exists(new_file))
                         {
                             Logger.Info("Copying " + old_file);
@@ -267,7 +265,7 @@ protected override ManagerStatus LoadManager()
                         }
                     }
 
-                    foreach (string old_subdir in Directory.GetDirectories(old_choco_path, "*", SearchOption.AllDirectories).Reverse())
+                    foreach (string old_subdir in Directory.GetDirectories(OldChocoPath, "*", SearchOption.AllDirectories).Reverse())
                     {
                         if (!Directory.EnumerateFiles(old_subdir).Any() && !Directory.EnumerateDirectories(old_subdir).Any())
                         {
@@ -276,15 +274,15 @@ protected override ManagerStatus LoadManager()
                         }
                     }
 
-                    if (!Directory.EnumerateFiles(old_choco_path).Any() && !Directory.EnumerateDirectories(old_choco_path).Any())
+                    if (!Directory.EnumerateFiles(OldChocoPath).Any() && !Directory.EnumerateDirectories(OldChocoPath).Any())
                     {
-                        Logger.Info("Deleting old Chocolatey directory " + old_choco_path);
-                        Directory.Delete(old_choco_path);
+                        Logger.Info("Deleting old Chocolatey directory " + OldChocoPath);
+                        Directory.Delete(OldChocoPath);
                     }
 
-                    CoreTools.CreateSymbolicLinkDir(old_choco_path, new_choco_path);
+                    CoreTools.CreateSymbolicLinkDir(OldChocoPath, NewChocoPath);
                     Settings.Set(Settings.K.ChocolateySymbolicLinkCreated, true);
-                    Logger.Info($"Symbolic link created successfully from {old_choco_path} to {new_choco_path}.");
+                    Logger.Info($"Symbolic link created successfully from {OldChocoPath} to {NewChocoPath}.");
 
                 }
                 catch (Exception e)
@@ -294,22 +292,6 @@ protected override ManagerStatus LoadManager()
                 }
             }
 
-            if (Settings.Get(Settings.K.UseSystemChocolatey) && !Settings.Get(Settings.K.TransferredSystemChocolatey))
-            {
-                var SystemPaths = CoreTools.WhichMultiple("choco");
-                if (SystemPaths.Count > 0)
-                {
-                    string SysPath = SystemPaths.ElementAt(0);
-                    for (int idx = 1; idx < SystemPaths.Count; idx++)
-                    {
-                        if (!SystemPaths.ElementAt(idx).Contains("UniGetUI"))
-                            SysPath = SystemPaths.ElementAt(idx);
-                    }
-                    Settings.SetDictionaryItem(Settings.K.ManagerPaths, "Chocolatey", SysPath);
-                    Settings.Set(Settings.K.TransferredSystemChocolatey, true);
-                }
-            }
-
             var (found, executable) = GetExecutableFile();
             ManagerStatus status = new() { Found = found, ExecutablePath = executable, ExecutableCallArgs = "", };