Rework how package managers are loaded

src/UniGetUI.Core.IconStore/IconDatabase.cs

@@ -19,25 +19,11 @@ public struct IconCount
             public IconCount() { }
         }
 
-        private static IconDatabase? __instance;
 
+        private static IconDatabase? __instance;
         public static IconDatabase Instance
         {
-            get
-            {
-                if (__instance is null)
-                {
-                    Logger.Error("IconStore.Instance was not initialized, creating an empty instance.");
-                    InitializeInstance();
-                    return Instance;
-                }
-                return __instance;
-            }
-        }
-
-        public static void InitializeInstance()
-        {
-            __instance = new();
+            get => __instance ??= new();
         }
 
         /// <summary>
@@ -51,10 +37,12 @@ public static void InitializeInstance()
         /// </summary>
         public async Task LoadIconAndScreenshotsDatabaseAsync()
         {
-            string IconsAndScreenshotsFile = Path.Join(CoreData.UniGetUICacheDirectory_Data, "Icon Database.json");
             try
             {
-                Uri DownloadUrl = new("https://github.com/marticliment/UniGetUI/raw/refs/heads/main/WebBasedData/screenshot-database-v2.json");
+                string IconsAndScreenshotsFile = Path.Join(CoreData.UniGetUICacheDirectory_Data, "Icon Database.json");
+                Uri DownloadUrl =
+                    new(
+                        "https://github.com/marticliment/UniGetUI/raw/refs/heads/main/WebBasedData/screenshot-database-v2.json");
                 if (Settings.Get(Settings.K.IconDataBaseURL))
                 {
                     DownloadUrl = new Uri(Settings.GetValue(Settings.K.IconDataBaseURL));
@@ -69,29 +57,29 @@ public async Task LoadIconAndScreenshotsDatabaseAsync()
 
                 Logger.ImportantInfo("Downloaded new icons and screenshots successfully!");
 
+
+                if (!File.Exists(IconsAndScreenshotsFile))
+                {
+                    Logger.Error("Icon Database file not found");
+                    return;
+                }
             }
             catch (Exception e)
             {
                 Logger.Warn("Failed to download icons and screenshots");
                 Logger.Warn(e);
             }
 
-            if (!File.Exists(IconsAndScreenshotsFile))
-            {
-                Logger.Error("Icon Database file not found");
-                return;
-            }
-
             // Update data with new cached file
             await LoadFromCacheAsync();
         }
 
 
         public async Task LoadFromCacheAsync()
         {
-            string IconsAndScreenshotsFile = Path.Join(CoreData.UniGetUICacheDirectory_Data, "Icon Database.json");
             try
             {
+                string IconsAndScreenshotsFile = Path.Join(CoreData.UniGetUICacheDirectory_Data, "Icon Database.json");
                 IconScreenshotDatabase_v2 JsonData = JsonSerializer.Deserialize<IconScreenshotDatabase_v2>(
                     await File.ReadAllTextAsync(IconsAndScreenshotsFile),
                     SerializationHelpers.DefaultOptions

src/UniGetUI.Interface.BackgroundApi/BackgroundApi.cs

@@ -12,6 +12,7 @@
 using UniGetUI.Interface.Enums;
 using UniGetUI.PackageEngine;
 using UniGetUI.PackageEngine.Interfaces;
+using UniGetUI.PackageEngine.PackageLoader;
 
 namespace UniGetUI.Interface
 {
@@ -128,18 +129,18 @@ private async Task WIDGETS_V1_GetUpdates(HttpContext context)
                 return;
             }
 
-            if (!PEInterface.UpgradablePackagesLoader.IsLoaded && !PEInterface.UpgradablePackagesLoader.IsLoading)
+            if (!UpgradablePackagesLoader.Instance.IsLoaded && !UpgradablePackagesLoader.Instance.IsLoading)
             {
-                _ = PEInterface.UpgradablePackagesLoader.ReloadPackages();
+                _ = UpgradablePackagesLoader.Instance.ReloadPackages();
             }
 
-            while (PEInterface.UpgradablePackagesLoader.IsLoading)
+            while (UpgradablePackagesLoader.Instance.IsLoading)
             {
                 await Task.Delay(100);
             }
 
             StringBuilder packages = new();
-            foreach (IPackage package in PEInterface.UpgradablePackagesLoader.Packages)
+            foreach (IPackage package in UpgradablePackagesLoader.Instance.Packages)
             {
                 if (package.Tag is PackageTag.OnQueue or PackageTag.BeingProcessed) continue;
 
@@ -247,7 +248,7 @@ private async Task WIDGETS_V2_GetIconForPackage(HttpContext context)
 
             string iconPath = Path.Join(CoreData.UniGetUIExecutableDirectory, "Assets", "Images", "package_color.png");
 
-            IPackage? package = PEInterface.UpgradablePackagesLoader.GetPackageForId(packageId, packageSource);
+            IPackage? package = UpgradablePackagesLoader.Instance.GetPackageForId(packageId, packageSource);
             if (package != null)
             {
                 var iconUrl = await Task.Run(package.GetIconUrl);

src/UniGetUI.PAckageEngine.Interfaces/IPackageManager.cs

@@ -14,7 +14,6 @@ public interface IPackageManager
         public string Name { get; }
         public string DisplayName { get; }
         public IManagerSource DefaultSource { get; }
-        public bool ManagerReady { get; }
         public IManagerLogger TaskLogger { get; }
         public IMultiSourceHelper SourcesHelper { get; }
         public IPackageDetailsHelper DetailsHelper { get; }

src/UniGetUI.PackageEngine.Enums/ManagerStatus.cs

@@ -1,12 +1,10 @@
 namespace UniGetUI.PackageEngine.Classes.Manager.ManagerHelpers
 {
-    public struct ManagerStatus
+    public class ManagerStatus
     {
         public string Version = "";
-        public bool Found = false;
+        public bool Found;
         public string ExecutablePath = "";
-        public string ExecutableCallArgs { get; set; } = "Unset";
-        public ManagerStatus()
-        { }
+        public string ExecutableCallArgs = "Unset";
     }
 }

src/UniGetUI.PackageEngine.Managers.Cargo/Cargo.cs

@@ -138,30 +138,23 @@ protected override IReadOnlyList<Package> GetInstalledPackages_UnSafe()
     }
 
     public override IReadOnlyList<string> FindCandidateExecutableFiles()
+        => CoreTools.WhichMultiple("cargo.exe");
+
+    protected override void _loadManagerExecutableFile(out bool found, out string path, out string callArguments)
     {
-        return CoreTools.WhichMultiple("cargo.exe");
+        var (_found, _executablePath) = GetExecutableFile();
+        found = _found;
+        path = _executablePath;
+        callArguments = "";
     }
 
-    protected override ManagerStatus LoadManager()
+    protected override void _loadManagerVersion(out string version)
     {
-        var (found, executablePath) = GetExecutableFile();
-        if (!found)
-        {
-            return new(){ ExecutablePath = executablePath, Found = false, Version = ""};
-        }
-
-        Status = new() { ExecutablePath = executablePath, Found = found, Version = "", ExecutableCallArgs = ""};
-
-        using Process p = GetProcess(executablePath, "--version");
+        using Process p = GetProcess(Status.ExecutablePath, "--version");
         p.Start();
-        string version = p.StandardOutput.ReadToEnd().Trim();
+        version = p.StandardOutput.ReadToEnd().Trim();
         string error = p.StandardError.ReadToEnd();
-        if (!string.IsNullOrEmpty(error))
-        {
-            Logger.Error("cargo version error: " + error);
-        }
-
-        return new() { ExecutablePath = executablePath, Found = found, Version = version, ExecutableCallArgs = ""};
+        if (!string.IsNullOrEmpty(error)) Logger.Error("cargo version error: " + error);
     }
 
     private IReadOnlyList<Package> GetPackages(LoggableTaskType taskType)

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

@@ -204,7 +204,7 @@ public override IReadOnlyList<string> FindCandidateExecutableFiles()
             return candidates;
         }
 
-        protected override ManagerStatus LoadManager()
+        protected override void _loadManagerExecutableFile(out bool found, out string path, out string callArguments)
         {
             if (!Directory.Exists(OldChocoPath))
             {
@@ -293,19 +293,19 @@ protected override ManagerStatus LoadManager()
                 }
             }
 
-            var (found, executable) = GetExecutableFile();
-            ManagerStatus status = new() { Found = found, ExecutablePath = executable, ExecutableCallArgs = "", };
-
-            if (!status.Found)
-            {
-                return status;
-            }
+            var (_found, _path) = GetExecutableFile();
+            found = _found;
+            path = _path;
+            callArguments = "";
+        }
 
+        protected override void _loadManagerVersion(out string version)
+        {
             Process process = new()
             {
                 StartInfo = new ProcessStartInfo
                 {
-                    FileName = status.ExecutablePath,
+                    FileName = Status.ExecutablePath,
                     Arguments = "--version " + GetProxyArgument(),
                     UseShellExecute = false,
                     RedirectStandardOutput = true,
@@ -315,19 +315,21 @@ protected override ManagerStatus LoadManager()
                 }
             };
             process.Start();
-            status.Version = process.StandardOutput.ReadToEnd().Trim();
+            version = process.StandardOutput.ReadToEnd().Trim();
+        }
 
+        protected override void _performExtraLoadingSteps()
+        {
             // If the user is running bundled chocolatey and chocolatey is not in path, add chocolatey to path
-            if (!Settings.Get(Settings.K.UseSystemChocolatey)
-                && !File.Exists("C:\\ProgramData\\Chocolatey\\bin\\choco.exe"))
-            /* && Settings.Get(Settings.K.ShownWelcomeWizard)) */
+            if (!Settings.Get(Settings.K.UseSystemChocolatey) && !File.Exists("C:\\ProgramData\\Chocolatey\\bin\\choco.exe"))
+                /* && Settings.Get(Settings.K.ShownWelcomeWizard)) */
             {
                 string? path = Environment.GetEnvironmentVariable("PATH", EnvironmentVariableTarget.User);
-                if (!path?.Contains(status.ExecutablePath.Replace("\\choco.exe", "\\bin")) ?? false)
+                if (!path?.Contains(Status.ExecutablePath.Replace("\\choco.exe", "\\bin")) ?? false)
                 {
                     Logger.ImportantInfo("Adding chocolatey to path since it was not on path.");
-                    Environment.SetEnvironmentVariable("PATH", $"{status.ExecutablePath.Replace("\\choco.exe", "\\bin")};{path}", EnvironmentVariableTarget.User);
-                    Environment.SetEnvironmentVariable("chocolateyinstall", Path.GetDirectoryName(status.ExecutablePath), EnvironmentVariableTarget.User);
+                    Environment.SetEnvironmentVariable("PATH", $"{Status.ExecutablePath.Replace("\\choco.exe", "\\bin")};{path}", EnvironmentVariableTarget.User);
+                    Environment.SetEnvironmentVariable("chocolateyinstall", Path.GetDirectoryName(Status.ExecutablePath), EnvironmentVariableTarget.User);
                 }
                 else
                 {
@@ -336,14 +338,12 @@ protected override ManagerStatus LoadManager()
             }
 
             // Trick chocolatey into using the wanted installation
-            var choco_dir = Path.GetDirectoryName(status.ExecutablePath)?.Replace('/', '\\').Trim('\\') ?? "";
+            var choco_dir = Path.GetDirectoryName(Status.ExecutablePath)?.Replace('/', '\\').Trim('\\') ?? "";
             if (choco_dir.EndsWith("bin"))
             {
                 choco_dir = choco_dir[..^3].Trim('\\');
             }
             Environment.SetEnvironmentVariable("chocolateyinstall", choco_dir, EnvironmentVariableTarget.Process);
-
-            return status;
         }
     }
 }

src/UniGetUI.PackageEngine.Managers.Dotnet/DotNet.cs

@@ -126,31 +126,23 @@ protected override IReadOnlyList<Package> _getInstalledPackages_UnSafe()
         }
 
         public override IReadOnlyList<string> FindCandidateExecutableFiles()
-        {
-            return CoreTools.WhichMultiple("dotnet.exe");
-        }
+            => CoreTools.WhichMultiple("dotnet.exe");
 
-        protected override ManagerStatus LoadManager()
+        protected override void _loadManagerExecutableFile(out bool found, out string path, out string callArguments)
         {
-            var (found, path) = GetExecutableFile();
-            ManagerStatus status = new()
-            {
-                ExecutablePath = path,
-                Found = found,
-                ExecutableCallArgs = "tool "
-            };
-
-            if (!status.Found)
-            {
-                return status;
-            }
-
-            Process process = new()
+            var (_found, _path) = GetExecutableFile();
+            found = _found;
+            path = _path;
+            callArguments = "tool ";
+
+            // Ensure .NET SDK is installed
+            if (!found) return;
+            var process = new Process()
             {
                 StartInfo = new ProcessStartInfo
                 {
-                    FileName = status.ExecutablePath,
-                    Arguments = status.ExecutableCallArgs + "-h",
+                    FileName = path,
+                    Arguments = callArguments + "-h",
                     UseShellExecute = false,
                     RedirectStandardOutput = true,
                     RedirectStandardError = true,
@@ -160,17 +152,16 @@ protected override ManagerStatus LoadManager()
             };
             process.Start();
             process.WaitForExit();
-            if (process.ExitCode != 0)
-            {
-                status.Found = false;
-                return status;
-            }
+            found = process.ExitCode is 0;
+        }
 
-            process = new()
+        protected override void _loadManagerVersion(out string version)
+        {
+            var process = new Process()
             {
                 StartInfo = new ProcessStartInfo
                 {
-                    FileName = status.ExecutablePath,
+                    FileName = Status.ExecutablePath,
                     Arguments = "--version",
                     UseShellExecute = false,
                     RedirectStandardOutput = true,
@@ -181,9 +172,7 @@ protected override ManagerStatus LoadManager()
             };
 
             process.Start();
-            status.Version = process.StandardOutput.ReadToEnd().Trim();
-
-            return status;
+            version = process.StandardOutput.ReadToEnd().Trim();
         }
     }
 }