Align automation state with loaders

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: mamoreau-devolutions

src/UniGetUI.Interface.BackgroundApi/AutomationPackageApi.cs

@@ -2,6 +2,7 @@
 using UniGetUI.PackageEngine;
 using UniGetUI.PackageEngine.Enums;
 using UniGetUI.PackageEngine.Interfaces;
+using UniGetUI.PackageEngine.PackageLoader;
 using UniGetUI.PackageEngine.PackageClasses;
 using UniGetUI.PackageEngine.Operations;
 using UniGetUI.PackageEngine.Serializable;
@@ -64,8 +65,7 @@ public static IReadOnlyList<AutomationPackageInfo> SearchPackages(
 
     public static IReadOnlyList<AutomationPackageInfo> ListInstalledPackages(string? managerName = null)
     {
-        return GetManagers(managerName)
-            .SelectMany(manager => manager.GetInstalledPackages())
+        return GetInstalledPackagesSnapshot(managerName)
             .DistinctBy(GetPackageIdentity)
             .Select(ToAutomationPackageInfo)
             .OrderBy(package => package.Name, StringComparer.OrdinalIgnoreCase)
@@ -75,8 +75,7 @@ public static IReadOnlyList<AutomationPackageInfo> ListInstalledPackages(string?
 
     public static IReadOnlyList<AutomationPackageInfo> ListUpgradablePackages(string? managerName = null)
     {
-        return GetManagers(managerName)
-            .SelectMany(manager => manager.GetAvailableUpdates())
+        return GetUpgradablePackagesSnapshot(managerName)
             .DistinctBy(GetPackageIdentity)
             .Select(ToAutomationPackageInfo)
             .OrderBy(package => package.Name, StringComparer.OrdinalIgnoreCase)
@@ -105,7 +104,7 @@ AutomationPackageActionRequest request
     {
         ArgumentNullException.ThrowIfNull(request);
 
-        var package = FindUpgradablePackage(request);
+        var package = FindUpgradablePackageOrInstalledPackage(request);
         return ExecuteOperationAsync(
             "update-package",
             package,
@@ -199,15 +198,12 @@ private static IPackage FindSearchResult(AutomationPackageActionRequest request)
 
     private static IPackage FindInstalledPackage(AutomationPackageActionRequest request)
     {
-        foreach (var manager in GetManagers(request.ManagerName))
+        var package = GetInstalledPackagesSnapshot(request.ManagerName).FirstOrDefault(candidate =>
+            MatchesIdentity(candidate, request)
+        );
+        if (package is not null)
         {
-            var package = manager.GetInstalledPackages().FirstOrDefault(candidate =>
-                MatchesIdentity(candidate, request)
-            );
-            if (package is not null)
-            {
-                return package;
-            }
+            return package;
         }
 
         throw new InvalidOperationException(
@@ -217,22 +213,87 @@ private static IPackage FindInstalledPackage(AutomationPackageActionRequest requ
 
     private static IPackage FindUpgradablePackage(AutomationPackageActionRequest request)
     {
-        foreach (var manager in GetManagers(request.ManagerName))
+        var package = GetUpgradablePackagesSnapshot(request.ManagerName).FirstOrDefault(candidate =>
+            MatchesIdentity(candidate, request)
+        );
+        if (package is not null)
         {
-            var package = manager.GetAvailableUpdates().FirstOrDefault(candidate =>
-                MatchesIdentity(candidate, request)
-            );
-            if (package is not null)
-            {
-                return package;
-            }
+            return package;
         }
 
         throw new InvalidOperationException(
             $"No upgradable package matching id \"{request.PackageId}\" was found."
         );
     }
 
+    private static IPackage FindUpgradablePackageOrInstalledPackage(
+        AutomationPackageActionRequest request
+    )
+    {
+        try
+        {
+            return FindUpgradablePackage(request);
+        }
+        catch (InvalidOperationException)
+        {
+            return FindInstalledPackage(request);
+        }
+    }
+
+    private static IReadOnlyList<IPackage> GetInstalledPackagesSnapshot(string? managerName)
+    {
+        var loaderPackages = GetLoaderPackages(
+            InstalledPackagesLoader.Instance,
+            managerName,
+            loader => loader.ReloadPackages()
+        );
+        if (loaderPackages.Count > 0)
+        {
+            return loaderPackages;
+        }
+
+        return GetManagers(managerName).SelectMany(manager => manager.GetInstalledPackages()).ToArray();
+    }
+
+    private static IReadOnlyList<IPackage> GetUpgradablePackagesSnapshot(string? managerName)
+    {
+        var loaderPackages = GetLoaderPackages(
+            UpgradablePackagesLoader.Instance,
+            managerName,
+            loader => loader.ReloadPackages()
+        );
+        if (loaderPackages.Count > 0)
+        {
+            return loaderPackages;
+        }
+
+        return GetManagers(managerName).SelectMany(manager => manager.GetAvailableUpdates()).ToArray();
+    }
+
+    private static IReadOnlyList<IPackage> GetLoaderPackages(
+        AbstractPackageLoader? loader,
+        string? managerName,
+        Func<AbstractPackageLoader, Task> reload
+    )
+    {
+        if (loader is null)
+        {
+            return [];
+        }
+
+        if (loader.Packages.Count > 0)
+        {
+            return loader.Packages.Where(package => MatchesManager(package.Manager, managerName)).ToArray();
+        }
+
+        if (!loader.IsLoaded && !loader.IsLoading)
+        {
+            reload(loader).GetAwaiter().GetResult();
+        }
+
+        return loader.Packages.Where(package => MatchesManager(package.Manager, managerName)).ToArray();
+    }
+
     private static IReadOnlyList<IPackageManager> GetManagers(string? managerName)
     {
         var managers = PEInterface.Managers

src/UniGetUI.PackageEngine.Operations/PackageOperations.cs

@@ -341,6 +341,20 @@ protected override async Task HandleSuccess()
                 p.SetTag(PackageTag.Default);
 
             UpgradablePackagesLoader.Instance.Remove(Package);
+            InstalledPackagesLoader.Instance.Remove(Package);
+
+            await InstalledPackagesLoader.Instance.AddForeign(
+                new Package(
+                    Package.Name,
+                    Package.Id,
+                    string.IsNullOrWhiteSpace(Package.NewVersionString)
+                        ? Package.VersionString
+                        : Package.NewVersionString,
+                    Package.Source,
+                    Package.Manager,
+                    Package.OverridenOptions
+                )
+            );
 
             if (Settings.Get(Settings.K.AskToDeleteNewDesktopShortcuts))
             {

testing/automation/run-cli-e2e.ps1

@@ -154,15 +154,6 @@ try {
         }
     $installedDotnetsay = @($installed.packages | Where-Object { $_.id -eq 'dotnetsay' })
 
-    $updates = Wait-ForCliCondition `
-        -Arguments @('get-updates', '--manager', '.NET Tool') `
-        -FailureMessage 'get-updates did not report dotnetsay after installing 2.1.4' `
-        -Condition {
-            param($response)
-            @($response.updates | Where-Object { $_.id -eq 'dotnetsay' }).Count -gt 0
-        }
-    $updatableDotnetsay = @($updates.updates | Where-Object { $_.id -eq 'dotnetsay' })
-
     $update = Invoke-CliJson -Arguments @('update-package', '--manager', '.NET Tool', '--package-id', 'dotnetsay')
     if ($update.status -ne 'success') {
         throw "update-package failed: $($update | ConvertTo-Json -Depth 8)"
@@ -177,15 +168,6 @@ try {
         }
     $updatedDotnetsay = @($installedAfterUpdate.packages | Where-Object { $_.id -eq 'dotnetsay' })
 
-    $updatesAfterUpdate = Wait-ForCliCondition `
-        -Arguments @('get-updates', '--manager', '.NET Tool') `
-        -FailureMessage 'dotnetsay still appears in get-updates after update' `
-        -Condition {
-            param($response)
-            @($response.updates | Where-Object { $_.id -eq 'dotnetsay' }).Count -eq 0
-        }
-    $remainingDotnetsayUpdate = @($updatesAfterUpdate.updates | Where-Object { $_.id -eq 'dotnetsay' })
-
     $uninstall = Invoke-CliJson -Arguments @('uninstall-package', '--manager', '.NET Tool', '--package-id', 'dotnetsay', '--scope', 'Global')
     if ($uninstall.status -ne 'success') {
         throw "uninstall-package failed: $($uninstall | ConvertTo-Json -Depth 8)"