Merge pull request #3100 from mrixner/fix-vcpkg-icon-id

marticliment · Dec 20, 2024 · 997acb1 · 997acb1
2 parents 628b724 + b544140
commit 997acb1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/UniGetUI.PackageEngine.Package/Package.cs b/src/UniGetUI.PackageEngine.Package/Package.cs
@@ -197,6 +197,8 @@ public string GetIconId()
                 iconId = iconId.Replace(".install", "").Replace(".portable", "");
             else if (Manager.Name == "Scoop")
                 iconId = iconId.Replace(".app", "");
+            else if (Manager.Name == "vcpkg")
+                iconId = iconId.split(":")[0].Split("[")[0];
             return iconId;
         }
 

diff --git a/src/UniGetUI.PackageEngine.PackageManagerClasses/Packages/Package.cs b/src/UniGetUI.PackageEngine.PackageManagerClasses/Packages/Package.cs
@@ -103,6 +103,7 @@ public Package(
                 "Winget" => string.Join('.', id.ToLower().Split(".")[1..]),
                 "Scoop" => id.ToLower().Replace(".app", ""),
                 "Chocolatey" => id.ToLower().Replace(".install", "").Replace(".portable", ""),
+                "vcpkg" => id.ToLower().Split(":")[0].Split("[")[0],
                 _ => id.ToLower()
             };
         }
@@ -173,7 +174,7 @@ public virtual Uri GetIconUrl()
             try
             {
                 CacheableIcon? icon = TaskRecycler<CacheableIcon?>.RunOrAttach(Manager.DetailsHelper.GetIcon, this);
-                string? path = IconCacheEngine.GetCacheOrDownloadIcon(icon, Manager.Name, Id);
+                string? path = IconCacheEngine.GetCacheOrDownloadIcon(icon, Manager.Name, _iconId);
                 return path is null? null: new Uri("file:///" + path);
             }
             catch (Exception ex)