Simplify generation and translation of Architecture and PackageScope Installation Options

marticliment · marticliment · commit ac50bba9206c · 2025-06-07T23:09:45.000+02:00
diff --git a/src/UniGetUI.Core.LanguageEngine/LanguageData.cs b/src/UniGetUI.Core.LanguageEngine/LanguageData.cs
@@ -152,22 +152,6 @@ private static Person[] LoadLanguageTranslatorList()
 
     public static class CommonTranslations
     {
-        public static readonly Dictionary<string, string> ArchNames = new()
-        {
-            { Architecture.X64, "x64" },
-            { Architecture.X86, "x86" },
-            { Architecture.Arm64, "arm64" },
-            { Architecture.Arm, "arm32" },
-        };
-
-        public static readonly Dictionary<string, string> InvertedArchNames = new()
-        {
-            { "x64", Architecture.X64 },
-            { "x86", Architecture.X86 },
-            { "arm64", Architecture.Arm64 },
-            { "arm32", Architecture.Arm },
-        };
-
         public static readonly Dictionary<string, string> ScopeNames = new()
         {
             { PackageScope.Global, "Machine | Global" },
@@ -179,18 +163,6 @@ public static class CommonTranslations
             { "Machine | Global", PackageScope.Global },
             { "User | Local", PackageScope.Local },
         };
-
-        public static readonly Dictionary<string, string> ScopeNames_NonLang = new()
-        {
-            { PackageScope.Global, "machine" },
-            { PackageScope.Local, "user" },
-        };
-
-        public static readonly Dictionary<string, string> InvertedScopeNames_NonLang = new()
-        {
-            { "machine", PackageScope.Global },
-            { "user", PackageScope.Local },
-        };
     }
 }
 
diff --git a/src/UniGetUI.PackageEngine.Enums/Enums.cs b/src/UniGetUI.PackageEngine.Enums/Enums.cs
@@ -5,18 +5,20 @@ namespace UniGetUI.PackageEngine.Enums
     /// </summary>
     public static class PackageScope
     {
-        public const string Global = "machine";
+        public static HashSet<string> ValidValues = [Machine, User];
         public const string Machine = "machine";
-        public const string Local = "user";
+        public const string Global = Machine;
         public const string User = "user";
+        public const string Local = User;
     }
 
     public static class Architecture
     {
-        public const string X86 = "x86";
-        public const string X64 = "x64";
-        public const string Arm = "arm32";
-        public const string Arm64 = "arm64";
+        public static HashSet<string> ValidValues = [x86, x64, arm32, arm64];
+        public const string x86 = "x86";
+        public const string x64 = "x64";
+        public const string arm32 = "arm32";
+        public const string arm64 = "arm64";
     }
 
     public enum DeserializedPackageStatus
diff --git a/src/UniGetUI.PackageEngine.Managers.Chocolatey/Chocolatey.cs b/src/UniGetUI.PackageEngine.Managers.Chocolatey/Chocolatey.cs
@@ -32,7 +32,7 @@ public Chocolatey()
                 CanRunInteractively = true,
                 SupportsCustomVersions = true,
                 SupportsCustomArchitectures = true,
-                SupportedCustomArchitectures = [Architecture.X86],
+                SupportedCustomArchitectures = [Architecture.x86],
                 SupportsPreRelease = true,
                 SupportsCustomSources = true,
                 SupportsCustomPackageIcons = true,
diff --git a/src/UniGetUI.PackageEngine.Managers.Chocolatey/Helpers/ChocolateyPkgOperationHelper.cs b/src/UniGetUI.PackageEngine.Managers.Chocolatey/Helpers/ChocolateyPkgOperationHelper.cs
@@ -32,7 +32,7 @@ protected override IReadOnlyList<string> _getOperationParameters(IPackage packag
         {
             parameters.Add("--no-progress");
 
-            if (options.Architecture == Architecture.X86)
+            if (options.Architecture == Architecture.x86)
                 parameters.Add("--forcex86");
 
             if (options.PreRelease)
diff --git a/src/UniGetUI.PackageEngine.Managers.Dotnet/DotNet.cs b/src/UniGetUI.PackageEngine.Managers.Dotnet/DotNet.cs
@@ -29,7 +29,7 @@ public DotNet()
                 CanDownloadInstaller = true,
                 SupportsCustomScopes = true,
                 SupportsCustomArchitectures = true,
-                SupportedCustomArchitectures = [Architecture.X86, Architecture.X64, Architecture.Arm64, Architecture.Arm],
+                SupportedCustomArchitectures = [Architecture.x86, Architecture.x64, Architecture.arm64, Architecture.arm32],
                 SupportsPreRelease = true,
                 SupportsCustomLocations = true,
                 SupportsCustomPackageIcons = true,
diff --git a/src/UniGetUI.PackageEngine.Managers.Dotnet/Helpers/DotNetPkgOperationHelper.cs b/src/UniGetUI.PackageEngine.Managers.Dotnet/Helpers/DotNetPkgOperationHelper.cs
@@ -42,10 +42,10 @@ protected override IReadOnlyList<string> _getOperationParameters(IPackage packag
         {
             parameters.AddRange(options.Architecture switch
             {
-                Architecture.X86 => ["--arch", "x86"],
-                Architecture.X64 => ["--arch", "x64"],
-                Architecture.Arm => ["--arch", "arm32"],
-                Architecture.Arm64 => ["--arch", "arm64"],
+                Architecture.x86 => ["--arch", "x86"],
+                Architecture.x64 => ["--arch", "x64"],
+                Architecture.arm32 => ["--arch", "arm32"],
+                Architecture.arm64 => ["--arch", "arm64"],
                 _ => []
             });
         }
diff --git a/src/UniGetUI.PackageEngine.Managers.Scoop/Helpers/ScoopPkgOperationHelper.cs b/src/UniGetUI.PackageEngine.Managers.Scoop/Helpers/ScoopPkgOperationHelper.cs
@@ -51,9 +51,9 @@ protected override IReadOnlyList<string> _getOperationParameters(IPackage packag
         {
             parameters.AddRange(options.Architecture switch
             {
-                Architecture.X64 => ["--arch", "64bit"],
-                Architecture.X86 => ["--arch", "32bit"],
-                Architecture.Arm64 => ["--arch", "arm64"],
+                Architecture.x64 => ["--arch", "64bit"],
+                Architecture.x86 => ["--arch", "32bit"],
+                Architecture.arm64 => ["--arch", "arm64"],
                 _ => []
             });
         }
diff --git a/src/UniGetUI.PackageEngine.Managers.Scoop/Scoop.cs b/src/UniGetUI.PackageEngine.Managers.Scoop/Scoop.cs
@@ -53,7 +53,7 @@ public Scoop()
                 CanDownloadInstaller = true,
                 CanRemoveDataOnUninstall = true,
                 SupportsCustomArchitectures = true,
-                SupportedCustomArchitectures = [Architecture.X86, Architecture.X64, Architecture.Arm64],
+                SupportedCustomArchitectures = [Architecture.x86, Architecture.x64, Architecture.arm64],
                 SupportsCustomScopes = true,
                 SupportsCustomSources = true,
                 Sources = new SourceCapabilities
diff --git a/src/UniGetUI.PackageEngine.Managers.WinGet/Helpers/WinGetPkgOperationHelper.cs b/src/UniGetUI.PackageEngine.Managers.WinGet/Helpers/WinGetPkgOperationHelper.cs
@@ -64,11 +64,11 @@ protected override IReadOnlyList<string> _getOperationParameters(IPackage packag
         {
             if (package.Name.Contains("64-bit") || package.Id.ToLower().Contains("x64"))
             {
-                options.Architecture = Architecture.X64;
+                options.Architecture = Architecture.x64;
             }
             else if (package.Name.Contains("32-bit") || package.Id.ToLower().Contains("x86"))
             {
-                options.Architecture = Architecture.X86;
+                options.Architecture = Architecture.x86;
             }
             parameters.Add("--include-unknown");
         }
@@ -85,9 +85,9 @@ protected override IReadOnlyList<string> _getOperationParameters(IPackage packag
 
             parameters.AddRange(options.Architecture switch
             {
-                Architecture.X86 => ["--architecture", "x86"],
-                Architecture.X64 => ["--architecture", "x64"],
-                Architecture.Arm64 => ["--architecture", "arm64"],
+                Architecture.x86 => ["--architecture", "x86"],
+                Architecture.x64 => ["--architecture", "x64"],
+                Architecture.arm64 => ["--architecture", "arm64"],
                 _ => []
             });
         }
diff --git a/src/UniGetUI.PackageEngine.Managers.WinGet/WinGet.cs b/src/UniGetUI.PackageEngine.Managers.WinGet/WinGet.cs
@@ -46,7 +46,7 @@ public WinGet()
                 SupportsCustomVersions = true,
                 CanDownloadInstaller = true,
                 SupportsCustomArchitectures = true,
-                SupportedCustomArchitectures = [Architecture.X86, Architecture.X64, Architecture.Arm64],
+                SupportedCustomArchitectures = [Architecture.x86, Architecture.x64, Architecture.arm64],
                 SupportsCustomScopes = true,
                 SupportsCustomLocations = true,
                 SupportsCustomSources = true,
diff --git a/src/UniGetUI/Pages/DialogPages/InstallOptions_Manager.xaml.cs b/src/UniGetUI/Pages/DialogPages/InstallOptions_Manager.xaml.cs
@@ -9,8 +9,7 @@
 using UniGetUI.PackageEngine.Interfaces;
 using UniGetUI.PackageEngine.PackageClasses;
 using UniGetUI.PackageEngine.Serializable;
-using Windows.ApplicationModel;
-using Windows.Gaming.XboxLive.Storage;
+using Architecture = UniGetUI.PackageEngine.Enums.Architecture;
 
 // To learn more about WinUI, the WinUI project structure,
 // and more about our project templates, see: http://aka.ms/winui-project-info.
@@ -87,10 +86,10 @@ private async Task LoadOptions()
             ArchitectureCombo.IsEnabled = true;
             foreach (string arch in Manager.Capabilities.SupportedCustomArchitectures)
             {
-                ArchitectureCombo.Items.Add(CommonTranslations.ArchNames[arch]);
-                if (options.Architecture == CommonTranslations.ArchNames[arch])
+                ArchitectureCombo.Items.Add(arch);
+                if (options.Architecture == arch)
                 {
-                    ArchitectureCombo.SelectedValue = CommonTranslations.ArchNames[arch];
+                    ArchitectureCombo.SelectedValue = arch;
                 }
             }
         }
@@ -103,13 +102,13 @@ private async Task LoadOptions()
         {
             ScopeCombo.IsEnabled = true;
             ScopeCombo.Items.Add(CoreTools.Translate(CommonTranslations.ScopeNames[PackageScope.Local]));
-            if (options.InstallationScope == CommonTranslations.ScopeNames_NonLang[PackageScope.Local])
+            if (options.InstallationScope == PackageScope.Local)
             {
                 ScopeCombo.SelectedValue = CommonTranslations.ScopeNames[PackageScope.Local];
             }
 
             ScopeCombo.Items.Add(CoreTools.Translate(CommonTranslations.ScopeNames[PackageScope.Global]));
-            if (options.InstallationScope == CommonTranslations.ScopeNames_NonLang[PackageScope.Global])
+            if (options.InstallationScope == PackageScope.Global)
             {
                 ScopeCombo.SelectedValue = CommonTranslations.ScopeNames[PackageScope.Global];
             }
@@ -159,18 +158,18 @@ private async Task SaveOptions()
 
         // Administrator
         options.Architecture = "";
-        string candidateValue = ArchitectureCombo.SelectedValue.ToString() ?? "";
-        if (CommonTranslations.InvertedArchNames.ContainsKey(candidateValue))
+        string userSelection = ArchitectureCombo.SelectedValue?.ToString() ?? "";
+        if (Architecture.ValidValues.Contains(userSelection))
         {
-            options.Architecture = candidateValue;
+            options.Architecture = userSelection;
         }
 
         // Scope
         options.InstallationScope = "";
-        candidateValue = ScopeCombo.SelectedValue.ToString() ?? "";
-        if (CommonTranslations.InvertedScopeNames.TryGetValue(candidateValue, out string? result))
+        userSelection = ScopeCombo.SelectedValue?.ToString() ?? "";
+        if (CommonTranslations.InvertedScopeNames.TryGetValue(userSelection, out string? value))
         {
-            options.InstallationScope = CommonTranslations.ScopeNames_NonLang[result];
+            options.InstallationScope = value;
         }
 
         // Location
diff --git a/src/UniGetUI/Pages/DialogPages/InstallOptions_Package.xaml.cs b/src/UniGetUI/Pages/DialogPages/InstallOptions_Package.xaml.cs
@@ -10,6 +10,7 @@
 using UniGetUI.PackageEngine.Interfaces;
 using UniGetUI.PackageEngine.PackageClasses;
 using UniGetUI.PackageEngine.Serializable;
+using Architecture = UniGetUI.PackageEngine.Enums.Architecture;
 
 // To learn more about WinUI, the WinUI project structure,
 // and more about our project templates, see: http://aka.ms/winui-project-info.
@@ -91,10 +92,10 @@ async Task LoadImage()
             {
                 foreach (string arch in Package.Manager.Capabilities.SupportedCustomArchitectures)
                 {
-                    ArchitectureComboBox.Items.Add(CommonTranslations.ArchNames[arch]);
-                    if (Options.Architecture == CommonTranslations.ArchNames[arch])
+                    ArchitectureComboBox.Items.Add(arch);
+                    if (Options.Architecture == arch)
                     {
-                        ArchitectureComboBox.SelectedValue = CommonTranslations.ArchNames[arch];
+                        ArchitectureComboBox.SelectedValue = arch;
                     }
                 }
             }
@@ -137,13 +138,13 @@ async Task LoadImage()
             if (package.Manager.Capabilities.SupportsCustomScopes)
             {
                 ScopeCombo.Items.Add(CoreTools.Translate(CommonTranslations.ScopeNames[PackageScope.Local]));
-                if (Options.InstallationScope == CommonTranslations.ScopeNames_NonLang[PackageScope.Local])
+                if (Options.InstallationScope == PackageScope.Local)
                 {
                     ScopeCombo.SelectedValue = CommonTranslations.ScopeNames[PackageScope.Local];
                 }
 
                 ScopeCombo.Items.Add(CoreTools.Translate(CommonTranslations.ScopeNames[PackageScope.Global]));
-                if (Options.InstallationScope == CommonTranslations.ScopeNames_NonLang[PackageScope.Global])
+                if (Options.InstallationScope == PackageScope.Global)
                 {
                     ScopeCombo.SelectedValue = CommonTranslations.ScopeNames[PackageScope.Global];
                 }
@@ -232,22 +233,18 @@ public async Task<InstallOptions> GetUpdatedOptions(bool updateIgnoredUpdates =
             Options.SkipHashCheck = HashCheckbox?.IsChecked ?? false;
             Options.OverridesNextLevelOpts = !FollowGlobalOptionsSwitch.IsOn;
 
-            if (CommonTranslations.InvertedArchNames.ContainsKey(ArchitectureComboBox.SelectedValue.ToString() ?? ""))
+            Options.Architecture = "";
+            var userSelection = ArchitectureComboBox.SelectedValue?.ToString() ?? "";
+            if (Architecture.ValidValues.Contains(userSelection))
             {
-                Options.Architecture = ArchitectureComboBox.SelectedValue.ToString() ?? "";
-            }
-            else
-            {
-                Options.Architecture = "";
+                Options.Architecture = userSelection;
             }
 
-            if (CommonTranslations.InvertedScopeNames.ContainsKey(ScopeCombo.SelectedValue.ToString() ?? ""))
-            {
-                Options.InstallationScope = CommonTranslations.ScopeNames_NonLang[CommonTranslations.InvertedScopeNames[ScopeCombo.SelectedValue.ToString() ?? ""]];
-            }
-            else
+            Options.InstallationScope = "";
+            userSelection = ScopeCombo.SelectedValue?.ToString() ?? "";
+            if (CommonTranslations.InvertedScopeNames.TryGetValue(userSelection, out string? value))
             {
-                Options.InstallationScope = "";
+                Options.InstallationScope = value;
             }
 
             if (CustomInstallLocation.Text == packageInstallLocation) Options.CustomInstallLocation = "";

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ protected override IReadOnlyList<string> _getOperationParameters(IPackage packag`
`32`	`32`	`{`
`33`	`33`	`parameters.Add("--no-progress");`
`34`	`34`
`35`		`- if (options.Architecture == Architecture.X86)`
	`35`	`+ if (options.Architecture == Architecture.x86)`
`36`	`36`	`parameters.Add("--forcex86");`
`37`	`37`
`38`	`38`	`if (options.PreRelease)`
Original file line number	Diff line number	Diff line change
`@@ -42,10 +42,10 @@ protected override IReadOnlyList<string> _getOperationParameters(IPackage packag`
`42`	`42`	`{`
`43`	`43`	`parameters.AddRange(options.Architecture switch`
`44`	`44`	`{`
`45`		`- Architecture.X86 => ["--arch", "x86"],`
`46`		`- Architecture.X64 => ["--arch", "x64"],`
`47`		`- Architecture.Arm => ["--arch", "arm32"],`
`48`		`- Architecture.Arm64 => ["--arch", "arm64"],`
	`45`	`+ Architecture.x86 => ["--arch", "x86"],`
	`46`	`+ Architecture.x64 => ["--arch", "x64"],`
	`47`	`+ Architecture.arm32 => ["--arch", "arm32"],`
	`48`	`+ Architecture.arm64 => ["--arch", "arm64"],`
`49`	`49`	`_ => []`
`50`	`50`	`});`
`51`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,9 +51,9 @@ protected override IReadOnlyList<string> _getOperationParameters(IPackage packag`
`51`	`51`	`{`
`52`	`52`	`parameters.AddRange(options.Architecture switch`
`53`	`53`	`{`
`54`		`- Architecture.X64 => ["--arch", "64bit"],`
`55`		`- Architecture.X86 => ["--arch", "32bit"],`
`56`		`- Architecture.Arm64 => ["--arch", "arm64"],`
	`54`	`+ Architecture.x64 => ["--arch", "64bit"],`
	`55`	`+ Architecture.x86 => ["--arch", "32bit"],`
	`56`	`+ Architecture.arm64 => ["--arch", "arm64"],`
`57`	`57`	`_ => []`
`58`	`58`	`});`
`59`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,11 +64,11 @@ protected override IReadOnlyList<string> _getOperationParameters(IPackage packag`
`64`	`64`	`{`
`65`	`65`	`if (package.Name.Contains("64-bit") \|\| package.Id.ToLower().Contains("x64"))`
`66`	`66`	`{`
`67`		`- options.Architecture = Architecture.X64;`
	`67`	`+ options.Architecture = Architecture.x64;`
`68`	`68`	`}`
`69`	`69`	`else if (package.Name.Contains("32-bit") \|\| package.Id.ToLower().Contains("x86"))`
`70`	`70`	`{`
`71`		`- options.Architecture = Architecture.X86;`
	`71`	`+ options.Architecture = Architecture.x86;`
`72`	`72`	`}`
`73`	`73`	`parameters.Add("--include-unknown");`
`74`	`74`	`}`
`@@ -85,9 +85,9 @@ protected override IReadOnlyList<string> _getOperationParameters(IPackage packag`
`85`	`85`
`86`	`86`	`parameters.AddRange(options.Architecture switch`
`87`	`87`	`{`
`88`		`- Architecture.X86 => ["--architecture", "x86"],`
`89`		`- Architecture.X64 => ["--architecture", "x64"],`
`90`		`- Architecture.Arm64 => ["--architecture", "arm64"],`
	`88`	`+ Architecture.x86 => ["--architecture", "x86"],`
	`89`	`+ Architecture.x64 => ["--architecture", "x64"],`
	`90`	`+ Architecture.arm64 => ["--architecture", "arm64"],`
`91`	`91`	`_ => []`
`92`	`92`	`});`
`93`	`93`	`}`