IconId not being properly calculated (fix #3752)

Author: marticliment

src/UniGetUI.PackageEngine.PackageManagerClasses/Packages/Package.cs

@@ -98,22 +98,7 @@ public Package(
 
             ignoredId = IgnoredUpdatesDatabase.GetIgnoredIdForPackage(this);
 
-            _iconId = Manager.Name switch
-            {
-                "Winget" => Source.Name switch
-                {
-                    "Steam" => id.ToLower().Split("\\")[^1].Replace("steam app ", "steam-").Trim(),
-                    "Local PC" => id.ToLower().Split("\\")[^1],
-                    "Microsoft Store" => id.IndexOf('_') < id.IndexOf('.') ? // If the first underscore is before the period, this ID has no publisher
-                        string.Join('_', id.ToLower().Split("\\")[1].Split("_")[0..^4]) : // no publisher: remove `MSIX\`, then the standard ending _version_arch__{random id}
-                        string.Join('_', string.Join('.', id.ToLower().Split(".")[1..]).Split("_")[0..^4]), // remove the publisher (before the first .), then the standard _version_arch__{random id}
-                    _ => 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()
-            };
+            _iconId = GenerateIconId(this);
         }
 
         /// <summary>
@@ -334,6 +319,31 @@ public static void ResetIconCache()
         {
             _cachedIconPaths.Clear();
         }
+
+        private static string GenerateIconId(Package p)
+        {
+            return (p.Manager.Name switch
+            {
+                "Winget" => p.Source.Name switch
+                {
+                    "Steam" => p.Id.ToLower().Split("\\")[^1].Replace("steam app ", "steam-").Trim(),
+                    "Local PC" => p.Id.Split("\\")[^1],
+                    "Microsoft Store" => p.Id.IndexOf('_') < p.Id.IndexOf('.')
+                        ? // If the first underscore is before the period, this ID has no publisher
+                        string.Join('_', p.Id.Split("\\")[1].Split("_")[0..^4])
+                        : // no publisher: remove `MSIX\`, then the standard ending _version_arch__{random p.Id}
+                        string.Join('_',
+                            string.Join('.', p.Id.Split(".")[1..])
+                                .Split("_")
+                                [0..^4]), // remove the publisher (before the first .), then the standard _version_arch__{random p.Id}
+                    _ => string.Join('.', p.Id.Split(".")[1..]),
+                },
+                "Scoop" => p.Id.Replace(".app", ""),
+                "Chocolatey" => p.Id.Replace(".install", "").Replace(".portable", ""),
+                "vcpkg" => p.Id.Split(":")[0].Split("[")[0],
+                _ => p.Id
+            }).ToLower().Replace('_', '-').Replace('.', '-').Replace(' ', '-').Replace('/', '-').Replace(',', '-');
+        }
     }
 }