More improvements to how icons and screenshots are loaded (fix #3620)

Author: marticliment

src/UniGetUI.Core.IconStore/IconDatabase.cs

@@ -59,7 +59,7 @@ public async Task LoadIconAndScreenshotsDatabaseAsync()
             string IconsAndScreenshotsFile = Path.Join(CoreData.UniGetUICacheDirectory_Data, "Icon Database.json");
             try
             {
-                Uri DownloadUrl = new("https://raw.githubusercontent.com/marticliment/UniGetUI/main/WebBasedData/screenshot-database-v2.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));

src/UniGetUI.PackageEngine.PackageManagerClasses/Manager/Helpers/BasePkgDetailsHelper.cs

@@ -60,6 +60,7 @@ public IReadOnlyList<string> GetVersions(IPackage package)
         {
             try
             {
+                // Load native icon
                 if (Manager.Capabilities.SupportsCustomPackageIcons)
                 {
                     var nativeIcon = GetIcon_UnSafe(package);
@@ -71,11 +72,11 @@ public IReadOnlyList<string> GetVersions(IPackage package)
 
                 // Try to get the icon especially for this package
                 string? iconUrl = IconDatabase.Instance.GetIconUrlForId(Manager.Name + "." + package.Id);
-                if (iconUrl is not null) return new CacheableIcon(new Uri(iconUrl), package.VersionString);
+                if (iconUrl is not null) return new CacheableIcon(new Uri(iconUrl));
 
                 // Try to get other corresponding icons for the package
                 iconUrl = IconDatabase.Instance.GetIconUrlForId(package.GetIconId());
-                if (iconUrl is not null) return new CacheableIcon(new Uri(iconUrl), package.VersionString);
+                if (iconUrl is not null) return new CacheableIcon(new Uri(iconUrl));
 
                 return null;
             } catch (Exception e)
@@ -92,6 +93,7 @@ public IReadOnlyList<Uri> GetScreenshots(IPackage package)
             {
                 IReadOnlyList<Uri> URIs = [];
 
+                // Load native screenshots
                 if (Manager.Capabilities.SupportsCustomPackageScreenshots)
                 {
                     URIs = GetScreenshots_UnSafe(package);
@@ -101,6 +103,19 @@ public IReadOnlyList<Uri> GetScreenshots(IPackage package)
                     Logger.Debug($"Manager {Manager.Name} does not support native screenshots");
                 }
 
+                // Try to get exact screenshots for this package
+                if (!URIs.Any())
+                {
+                    string[] UrlArray = IconDatabase.Instance.GetScreenshotsUrlForId(Manager.Name + "." + package.Id);
+                    List<Uri> UriList = [];
+                    foreach (string url in UrlArray)
+                    {
+                        if (url != "") UriList.Add(new Uri(url));
+                    }
+                    URIs = UriList;
+                }
+
+                // Try to get matching screenshots for this package
                 if (!URIs.Any())
                 {
                     string[] UrlArray = IconDatabase.Instance.GetScreenshotsUrlForId(package.GetIconId());