Merge pull request #3721 from marticliment/improvements-to-install-options

Author: marticliment

README.md

@@ -8,7 +8,7 @@ The main goal of this project is to create an intuitive GUI for the most common
 With this app, you can easily download, install, update, and uninstall any software published on the supported package managers — and much more!
 
 ![image](https://github.com/user-attachments/assets/7cb447ca-ee8b-4bce-8561-b9332fb0139a)
-
+View more screenshots [here](#screenthots)
 
 Check out the [Supported Package Managers Table](#supported-package-managers) for more details!
 

src/UniGetUI.Core.LanguageEngine/LanguageData.cs

@@ -5,6 +5,7 @@
 using UniGetUI.Core.Data;
 using UniGetUI.Core.Logging;
 using UniGetUI.PackageEngine.Enums;
+using Architecture = UniGetUI.PackageEngine.Enums.Architecture;
 
 namespace UniGetUI.Core.Language
 {
@@ -151,45 +152,17 @@ private static Person[] LoadLanguageTranslatorList()
 
     public static class CommonTranslations
     {
-        public static readonly Dictionary<Architecture, string> ArchNames = new()
-        {
-            { Architecture.X64, "x64" },
-            { Architecture.X86, "x86" },
-            { Architecture.Arm64, "arm64" },
-            { Architecture.Arm, "arm32" },
-        };
-
-        public static readonly Dictionary<string, Architecture> InvertedArchNames = new()
-        {
-            { "x64", Architecture.X64 },
-            { "x86", Architecture.X86 },
-            { "arm64", Architecture.Arm64 },
-            { "arm32", Architecture.Arm },
-        };
-
-        public static readonly Dictionary<PackageScope, string> ScopeNames = new()
+        public static readonly Dictionary<string, string> ScopeNames = new()
         {
             { PackageScope.Global, "Machine | Global" },
             { PackageScope.Local, "User | Local" },
         };
 
-        public static readonly Dictionary<string, PackageScope> InvertedScopeNames = new()
+        public static readonly Dictionary<string, string> InvertedScopeNames = new()
         {
             { "Machine | Global", PackageScope.Global },
             { "User | Local", PackageScope.Local },
         };
-
-        public static readonly Dictionary<PackageScope, string> ScopeNames_NonLang = new()
-        {
-            { PackageScope.Global, "machine" },
-            { PackageScope.Local, "user" },
-        };
-
-        public static readonly Dictionary<string, PackageScope> InvertedScopeNames_NonLang = new()
-        {
-            { "machine", PackageScope.Global },
-            { "user", PackageScope.Local },
-        };
     }
 }
 

src/UniGetUI.Core.Tools/Tools.cs

@@ -694,5 +694,9 @@ public static string GetCurrentLocale()
         {
             return LanguageEngine?.Locale ?? "Unset/Unknown";
         }
+
+        private static readonly HashSet<char> illegalPathChars = Path.GetInvalidFileNameChars().ToHashSet();
+        public static string MakeValidFileName(string name)
+            => string.Concat(name.Where(x => !illegalPathChars.Contains(x)));
     }
 }

src/UniGetUI.PAckageEngine.Interfaces/IInstallationOptions.cs

@@ -149,7 +149,7 @@ public interface IPackage : INotifyPropertyChanged, IEquatable<IPackage>
         /// <returns>False if the update is a major update or the update doesn't exist, true if it's a minor update</returns>
         public bool IsUpdateMinor();
 
-        public SerializablePackage AsSerializable();
+        public Task<SerializablePackage> AsSerializableAsync();
 
         public SerializableIncompatiblePackage AsSerializable_Incompatible();
     }

src/UniGetUI.PAckageEngine.Interfaces/IPackage.cs

@@ -1,4 +1,5 @@
 using UniGetUI.PackageEngine.Enums;
+using UniGetUI.PackageEngine.Serializable;
 
 namespace UniGetUI.PackageEngine.Interfaces.ManagerProviders
 {
@@ -12,11 +13,9 @@ public interface IPackageOperationHelper
         /// that the requested operation is performed over the given package, with its corresponding
         /// installation options.
         /// </summary>
-        public IReadOnlyList<string> GetParameters(
-            IPackage package,
-            IInstallationOptions options,
-            OperationType operation
-        );
+        public IReadOnlyList<string> GetParameters(IPackage package,
+            InstallOptions options,
+            OperationType operation);
 
         /// <summary>
         /// Returns the veredict of the given package operation, given the package, the operation type,

src/UniGetUI.PAckageEngine.Interfaces/ManagerHelpers/IPackageOperationHelper.cs

@@ -3,12 +3,22 @@ namespace UniGetUI.PackageEngine.Enums
     /// <summary>
     /// Represents the installation scope of a package
     /// </summary>
-    public enum PackageScope
+    public static class PackageScope
     {
-        Global = 1,
-        Machine = 1,
-        Local = 0,
-        User = 0,
+        public static HashSet<string> ValidValues = [Machine, User];
+        public const string Machine = "machine";
+        public const string Global = Machine;
+        public const string User = "user";
+        public const string Local = User;
+    }
+
+    public static class Architecture
+    {
+        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

src/UniGetUI.PackageEngine.Enums/Enums.cs

@@ -28,7 +28,7 @@ public struct ManagerCapabilities
         public bool CanDownloadInstaller = false;
         public bool SupportsCustomVersions = false;
         public bool SupportsCustomArchitectures = false;
-        public Architecture[] SupportedCustomArchitectures = [];
+        public string[] SupportedCustomArchitectures = [];
         public bool SupportsCustomScopes = false;
         public bool SupportsPreRelease = false;
         public bool SupportsCustomLocations = false;

src/UniGetUI.PackageEngine.Enums/ManagerCapabilities.cs

@@ -3,12 +3,12 @@
 namespace UniGetUI.PackageEngine.Structs;
 public struct OverridenInstallationOptions
 {
-    public PackageScope? Scope;
+    public string? Scope;
     public bool? RunAsAdministrator;
     public bool PowerShell_DoNotSetScopeParameter = false;
     public bool? WinGet_SpecifyVersion = null;
 
-    public OverridenInstallationOptions(PackageScope? scope = null, bool? runAsAdministrator = null)
+    public OverridenInstallationOptions(string? scope = null, bool? runAsAdministrator = null)
     {
         Scope = scope;
         RunAsAdministrator = runAsAdministrator;

src/UniGetUI.PackageEngine.Enums/OverridenInstallationOptions.cs

@@ -1,12 +1,14 @@
 using UniGetUI.PackageEngine.Classes.Manager.BaseProviders;
 using UniGetUI.PackageEngine.Enums;
 using UniGetUI.PackageEngine.Interfaces;
+using UniGetUI.PackageEngine.Serializable;
 
 namespace UniGetUI.PackageEngine.Managers.CargoManager;
 
 internal sealed class CargoPkgOperationHelper(Cargo cargo) : BasePkgOperationHelper(cargo)
 {
-    protected override IReadOnlyList<string> _getOperationParameters(IPackage package, IInstallationOptions options, OperationType operation)
+    protected override IReadOnlyList<string> _getOperationParameters(IPackage package,
+        InstallOptions options, OperationType operation)
     {
         var version = options.Version == string.Empty ? package.VersionString : options.Version;
         List<string> parameters = operation switch