Smarter mainfest caching on NuGet-based managers

Author: marticliment

src/UniGetUI.PackageEngine.Managers.Generic.NuGet/BaseNuGet.cs

@@ -14,6 +14,8 @@ namespace UniGetUI.PackageEngine.Managers.PowerShellManager
 {
     public abstract class BaseNuGet : PackageManager
     {
+        public static Dictionary<long, string> Manifests = new();
+
         public sealed override void Initialize()
         {
             if (DetailsHelper is not BaseNuGetDetailsHelper)
@@ -39,6 +41,7 @@ private struct SearchResult
             public string version;
             public CoreTools.Version version_float;
             public string id;
+            public string manifest;
         }
 
         protected sealed override IReadOnlyList<Package> FindPackages_UnSafe(string query)
@@ -93,14 +96,13 @@ protected sealed override IReadOnlyList<Package> FindPackages_UnSafe(string quer
                         var float_version = CoreTools.VersionStringToStruct(version);
                         // Match title = Regex.Match(match.Value, "<title[ \\\"\\=A-Za-z0-9]+>([^<>]+)<\\/title>");
 
-                        if (AlreadyProcessedPackages.TryGetValue(id, out var value) &&
-                            value.version_float >= float_version)
+                        if (AlreadyProcessedPackages.TryGetValue(id, out var value) && value.version_float >= float_version)
                         {
                             continue;
                         }
 
                         AlreadyProcessedPackages[id] =
-                            new SearchResult { id = id, version = version, version_float = float_version };
+                            new SearchResult { id = id, version = version, version_float = float_version, manifest = match.Value };
                     }
 
                     SearchUrl = null;
@@ -115,7 +117,9 @@ protected sealed override IReadOnlyList<Package> FindPackages_UnSafe(string quer
                 foreach (SearchResult package in AlreadyProcessedPackages.Values)
                 {
                     logger.Log($"Found package {package.id} version {package.version} on source {source.Name}");
-                    Packages.Add(new Package(CoreTools.FormatAsName(package.id), package.id, package.version, source, this));
+                    var nativePackage = new Package(CoreTools.FormatAsName(package.id), package.id, package.version, source, this);
+                    Packages.Add(nativePackage);
+                    Manifests[nativePackage.GetHash()] = package.manifest;
                 }
             }
 
@@ -182,7 +186,10 @@ protected override IReadOnlyList<Package> GetAvailableUpdates_UnSafe()
                         // Match title = Regex.Match(match.Value, "<title[ \\\"\\=A-Za-z0-9]+>([^<>]+)<\\/title>");
 
                         logger.Log($"Found package {id} version {new_version} on source {pair.Key.Name}");
-                        Packages.Add(new Package(CoreTools.FormatAsName(id), id, packageIdVersion[id.ToLower()], new_version, pair.Key, this));
+
+                        var nativePackage = new Package(CoreTools.FormatAsName(id), id, packageIdVersion[id.ToLower()], new_version, pair.Key, this);
+                        Packages.Add(nativePackage);
+                        Manifests[nativePackage.GetHash()] = match.Value;
                     }
                 }
             }

src/UniGetUI.PackageEngine.Managers.Generic.NuGet/Internal/NuGetManifestLoader.cs

@@ -1,13 +1,12 @@
 using UniGetUI.Core.Data;
 using UniGetUI.Core.Logging;
 using UniGetUI.PackageEngine.Interfaces;
+using UniGetUI.PackageEngine.Managers.PowerShellManager;
 
 namespace UniGetUI.PackageEngine.Managers.Generic.NuGet.Internal
 {
     internal static class NuGetManifestLoader
     {
-        private static readonly Dictionary<string, string> __manifest_cache = [];
-
         /// <summary>
         /// Returns the URL to the manifest of a NuGet-based package
         /// </summary>
@@ -35,14 +34,15 @@ public static Uri GetNuPkgUrl(IPackage package)
         /// <returns>A string containing the contents of the manifest</returns>
         public static string? GetManifestContent(IPackage package)
         {
-            string? PackageManifestContent = "";
-            string PackageManifestUrl = GetManifestUrl(package).ToString();
-            if (__manifest_cache.TryGetValue(PackageManifestUrl, out var content))
+            if (BaseNuGet.Manifests.TryGetValue(package.GetHash(), out string? manifest))
             {
                 Logger.Debug($"Loading cached NuGet manifest for package {package.Id} on manager {package.Manager.Name}");
-                return content;
+                return manifest;
             }
 
+            string? PackageManifestContent = "";
+            string PackageManifestUrl = GetManifestUrl(package).ToString();
+
             try
             {
                 using (HttpClient client = new(CoreData.GenericHttpClientParameters))
@@ -62,7 +62,7 @@ public static Uri GetNuPkgUrl(IPackage package)
 
                     PackageManifestContent = response.Content.ReadAsStringAsync().GetAwaiter().GetResult();
                 }
-                __manifest_cache[PackageManifestUrl] = PackageManifestContent;
+                BaseNuGet.Manifests[package.GetHash()] = PackageManifestContent;
                 return PackageManifestContent;
             }
             catch (Exception e)