InstallationOptions will also have the new OverrideNextLevelPrefs

Author: marticliment

src/UniGetUI.PackageEngine.PackageManagerClasses/Packages/Classes/InstallationOptions.cs

@@ -30,9 +30,9 @@ public class InstallationOptions : IInstallationOptions
         public bool RemoveDataOnUninstall { get; set; }
         public bool PreRelease { get; set; }
         public string CustomInstallLocation { get; set; } = "";
+        public bool OverridesNextLevelOpts { get; set; }
 
         public IPackage Package { get; }
-
         private readonly string __save_filename;
 
         private InstallationOptions(IPackage package)
@@ -122,24 +122,21 @@ public void FromSerializable(SerializableInstallationOptions options)
             Version = options.Version;
             SkipMinorUpdates = options.SkipMinorUpdates;
             PreRelease = options.PreRelease;
+            OverridesNextLevelOpts = options.OverridesNextLevelOpts;
 
-            if (options.Architecture != "" && CommonTranslations.InvertedArchNames.TryGetValue(options.Architecture, out var name))
+            Architecture = null;
+            if (options.Architecture.Any() &&
+                CommonTranslations.InvertedArchNames.TryGetValue(options.Architecture, out var name))
             {
                 Architecture = name;
             }
-            else
-            {
-                Architecture = null;
-            }
 
-            if (options.InstallationScope != "" && CommonTranslations.InvertedScopeNames_NonLang.TryGetValue(options.InstallationScope, out var value))
+            InstallationScope = null;
+            if (options.InstallationScope.Any() &&
+                CommonTranslations.InvertedScopeNames_NonLang.TryGetValue(options.InstallationScope, out var value))
             {
                 InstallationScope = value;
             }
-            else
-            {
-                InstallationScope = null;
-            }
 
             CustomParameters = options.CustomParameters;
         }
@@ -157,17 +154,15 @@ public SerializableInstallationOptions AsSerializable()
                 CustomInstallLocation = CustomInstallLocation,
                 PreRelease = PreRelease,
                 Version = Version,
-                SkipMinorUpdates = SkipMinorUpdates
+                SkipMinorUpdates = SkipMinorUpdates,
+                OverridesNextLevelOpts = OverridesNextLevelOpts
             };
+
             if (Architecture is not null)
-            {
                 options.Architecture = CommonTranslations.ArchNames[Architecture.Value];
-            }
 
             if (InstallationScope is not null)
-            {
                 options.InstallationScope = CommonTranslations.ScopeNames_NonLang[InstallationScope.Value];
-            }
 
             options.CustomParameters = CustomParameters;
             return options;

src/UniGetUI.PackageEngine.Serializable.Tests/TestSerializableInstallationOptions.cs

@@ -81,7 +81,7 @@ public void FromJson(string JSON, bool hash, bool inter, string installLoc, stri
 
         var list = new List<string>() { arg1, arg2, arg3 }.Where(x => x.Any());
 
-        Assert.Equal(mod, o2.OverrideNextLevelPrefs);
+        Assert.Equal(mod, o2.OverridesNextLevelOpts);
         Assert.Equal(mod, o2.DiffersFromDefault());
         Assert.Equal(hash, o2.SkipHashCheck);
         Assert.Equal(arch, o2.Architecture);

src/UniGetUI.PackageEngine.Serializable/SerializableInstallationOptions.cs

@@ -15,7 +15,7 @@ public class SerializableInstallationOptions: SerializableComponent<Serializable
         public string CustomInstallLocation { get; set; } = "";
         public string Version { get; set; } = "";
         public bool SkipMinorUpdates { get; set; }
-        public bool OverrideNextLevelPrefs { get; set; }
+        public bool OverridesNextLevelOpts { get; set; }
 
         public override SerializableInstallationOptions Copy()
         {
@@ -31,7 +31,7 @@ public override SerializableInstallationOptions Copy()
                 RunAsAdministrator = RunAsAdministrator,
                 Version = Version,
                 SkipMinorUpdates = SkipMinorUpdates,
-                OverrideNextLevelPrefs = OverrideNextLevelPrefs,
+                OverridesNextLevelOpts = OverridesNextLevelOpts,
             };
         }
 
@@ -52,11 +52,11 @@ public override void LoadFromJson(JsonNode data)
             this.Version = data[nameof(Version)]?.GetVal<string>() ?? "";
             this.SkipMinorUpdates = data[nameof(SkipMinorUpdates)]?.GetVal<bool>() ?? false;
 
-            // if OverrideNextLevelPrefs is not found on the JSON, set it to true or false depending
+            // if OverridesNextLevelOpts is not found on the JSON, set it to true or false depending
             // on whether the current settings instances are different from the default values.
             // This entry shall be checked the last one, to ensure all other properties are set
-            this.OverrideNextLevelPrefs =
-                data[nameof(OverrideNextLevelPrefs)]?.GetValue<bool>() ?? DiffersFromDefault();
+            this.OverridesNextLevelOpts =
+                data[nameof(OverridesNextLevelOpts)]?.GetValue<bool>() ?? DiffersFromDefault();
         }
 
         public bool DiffersFromDefault()
@@ -71,7 +71,7 @@ SkipMinorUpdates is not false ||
                    CustomParameters.Where(x => x != "").Any() ||
                    CustomInstallLocation.Any() ||
                    Version.Any();
-            // OverrideNextLevelPrefs does not need to be checked here, since
+            // OverridesNextLevelOpts does not need to be checked here, since
             // this method is invoked before this property has been set
         }