Merge pull request #2557 from marticliment/overriden-installation-opt…

…ions Add OverridenInstallationOptions to Packages
marticliment · Aug 28, 2024 · 6a0dba1 · 6a0dba1
2 parents 82bc51c + 3b16792
commit 6a0dba1
Show file tree

Hide file tree

Showing 60 changed files with 359 additions and 394 deletions.
diff --git a/src/ExternalLibraries.FilePickers/Classes/FileOpenDialogRCW.cs b/src/ExternalLibraries.FilePickers/Classes/FileOpenDialogRCW.cs
@@ -1,5 +1,5 @@
-using ExternalLibraries.Pickers.Guids;
-using System.Runtime.InteropServices;
+using System.Runtime.InteropServices;
+using ExternalLibraries.Pickers.Guids;
 
 namespace ExternalLibraries.Pickers.Classes;
 

diff --git a/src/ExternalLibraries.FilePickers/Classes/FileSaveDialogRCW.cs b/src/ExternalLibraries.FilePickers/Classes/FileSaveDialogRCW.cs
@@ -1,5 +1,5 @@
-using ExternalLibraries.Pickers.Guids;
-using System.Runtime.InteropServices;
+using System.Runtime.InteropServices;
+using ExternalLibraries.Pickers.Guids;
 
 namespace ExternalLibraries.Pickers.Classes;
 

diff --git a/src/ExternalLibraries.FilePickers/Classes/Helper.cs b/src/ExternalLibraries.FilePickers/Classes/Helper.cs
@@ -1,7 +1,7 @@
-using ExternalLibraries.Pickers.Enums;
+using System.Runtime.InteropServices;
+using ExternalLibraries.Pickers.Enums;
 using ExternalLibraries.Pickers.Interfaces;
 using ExternalLibraries.Pickers.Structures;
-using System.Runtime.InteropServices;
 
 namespace ExternalLibraries.Pickers.Classes;
 

diff --git a/src/ExternalLibraries.FilePickers/Interfaces/FileOpenDialog.cs b/src/ExternalLibraries.FilePickers/Interfaces/FileOpenDialog.cs
@@ -1,6 +1,6 @@
-using ExternalLibraries.Pickers.Classes;
+using System.Runtime.InteropServices;
+using ExternalLibraries.Pickers.Classes;
 using ExternalLibraries.Pickers.Guids;
-using System.Runtime.InteropServices;
 
 namespace ExternalLibraries.Pickers.Interfaces;
 

diff --git a/src/ExternalLibraries.FilePickers/Interfaces/FileSaveDialog.cs b/src/ExternalLibraries.FilePickers/Interfaces/FileSaveDialog.cs
@@ -1,6 +1,6 @@
-using ExternalLibraries.Pickers.Classes;
+using System.Runtime.InteropServices;
+using ExternalLibraries.Pickers.Classes;
 using ExternalLibraries.Pickers.Guids;
-using System.Runtime.InteropServices;
 
 namespace ExternalLibraries.Pickers.Interfaces;
 

diff --git a/src/ExternalLibraries.FilePickers/Interfaces/IFileDialog.cs b/src/ExternalLibraries.FilePickers/Interfaces/IFileDialog.cs
@@ -1,8 +1,8 @@
-using ExternalLibraries.Pickers.Enums;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using ExternalLibraries.Pickers.Enums;
 using ExternalLibraries.Pickers.Guids;
 using ExternalLibraries.Pickers.Structures;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
 
 namespace ExternalLibraries.Pickers.Interfaces;
 

diff --git a/src/ExternalLibraries.FilePickers/Interfaces/IFileDialogEvents.cs b/src/ExternalLibraries.FilePickers/Interfaces/IFileDialogEvents.cs
@@ -1,7 +1,7 @@
-using ExternalLibraries.Pickers.Enums;
-using ExternalLibraries.Pickers.Guids;
-using System.Runtime.CompilerServices;
+using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
+using ExternalLibraries.Pickers.Enums;
+using ExternalLibraries.Pickers.Guids;
 
 namespace ExternalLibraries.Pickers.Interfaces;
 

diff --git a/src/ExternalLibraries.FilePickers/Interfaces/IFileOpenDialog.cs b/src/ExternalLibraries.FilePickers/Interfaces/IFileOpenDialog.cs
@@ -1,7 +1,7 @@
-using ExternalLibraries.Pickers.Guids;
-using ExternalLibraries.Pickers.Structures;
-using System.Runtime.CompilerServices;
+using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
+using ExternalLibraries.Pickers.Guids;
+using ExternalLibraries.Pickers.Structures;
 
 namespace ExternalLibraries.Pickers.Interfaces;
 

diff --git a/src/ExternalLibraries.FilePickers/Interfaces/IModalWindow.cs b/src/ExternalLibraries.FilePickers/Interfaces/IModalWindow.cs
@@ -1,6 +1,6 @@
-using ExternalLibraries.Pickers.Guids;
-using System.Runtime.CompilerServices;
+using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
+using ExternalLibraries.Pickers.Guids;
 
 namespace ExternalLibraries.Pickers.Interfaces;
 

diff --git a/src/ExternalLibraries.FilePickers/Interfaces/IShellItem.cs b/src/ExternalLibraries.FilePickers/Interfaces/IShellItem.cs
@@ -1,7 +1,7 @@
-using ExternalLibraries.Pickers.Enums;
-using ExternalLibraries.Pickers.Guids;
-using System.Runtime.CompilerServices;
+using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
+using ExternalLibraries.Pickers.Enums;
+using ExternalLibraries.Pickers.Guids;
 
 namespace ExternalLibraries.Pickers.Interfaces;
 

diff --git a/src/ExternalLibraries.FilePickers/Interfaces/IShellItemArray.cs b/src/ExternalLibraries.FilePickers/Interfaces/IShellItemArray.cs
@@ -1,8 +1,8 @@
-using ExternalLibraries.Pickers.Enums;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using ExternalLibraries.Pickers.Enums;
 using ExternalLibraries.Pickers.Guids;
 using ExternalLibraries.Pickers.Structures;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
 
 namespace ExternalLibraries.Pickers.Interfaces;
 

diff --git a/src/UniGetUI.Core.LanguageEngine/LanguageEngine.cs b/src/UniGetUI.Core.LanguageEngine/LanguageEngine.cs
@@ -1,7 +1,7 @@
-using Jeffijoe.MessageFormat;
 using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 using System.Text.Json.Nodes;
+using Jeffijoe.MessageFormat;
 using UniGetUI.Core.Data;
 using UniGetUI.Core.Logging;
 using UniGetUI.Core.SettingsEngine;

diff --git a/src/UniGetUI.Interface.BackgroundApi/BackgroundApi.cs b/src/UniGetUI.Interface.BackgroundApi/BackgroundApi.cs
@@ -1,6 +1,6 @@
+using System.Text;
 using Nancy;
 using Nancy.Hosting.Self;
-using System.Text;
 using UniGetUI.Core.Data;
 using UniGetUI.Core.Logging;
 using UniGetUI.Core.SettingsEngine;

diff --git a/src/UniGetUI.PAckageEngine.Interfaces/IPackage.cs b/src/UniGetUI.PAckageEngine.Interfaces/IPackage.cs
@@ -1,7 +1,7 @@
 using System.ComponentModel;
 using UniGetUI.Interface.Enums;
 using UniGetUI.PackageEngine.Classes.Serializable;
-using UniGetUI.PackageEngine.Enums;
+using UniGetUI.PackageEngine.Structs;
 
 namespace UniGetUI.PackageEngine.Interfaces
 {
@@ -19,8 +19,7 @@ public interface IPackage : INotifyPropertyChanged, IEquatable<IPackage>
         public IPackageManager Manager { get; }
         public string NewVersion { get; }
         public bool IsUpgradable { get; }
-        public PackageScope Scope { get; set; }
-        public string SourceAsString { get; }
+        public ref OverridenInstallationOptions OverridenOptions { get; }
         public string AutomationName { get; }
 
         /// <summary>

diff --git a/src/UniGetUI.PAckageEngine.Interfaces/IPackageManager.cs b/src/UniGetUI.PAckageEngine.Interfaces/IPackageManager.cs
@@ -1,6 +1,4 @@
-using System.Diagnostics;
 using UniGetUI.PackageEngine.Classes.Manager.ManagerHelpers;
-using UniGetUI.PackageEngine.Enums;
 using UniGetUI.PackageEngine.Interfaces.ManagerProviders;
 using UniGetUI.PackageEngine.ManagerClasses.Classes;
 using UniGetUI.PackageEngine.ManagerClasses.Manager;

diff --git a/src/UniGetUI.PAckageEngine.Interfaces/ManagerProperties.cs b/src/UniGetUI.PAckageEngine.Interfaces/ManagerProperties.cs
@@ -1,5 +1,5 @@
-using UniGetUI.PackageEngine.Interfaces;
 using UniGetUI.Interface.Enums;
+using UniGetUI.PackageEngine.Interfaces;
 
 namespace UniGetUI.PackageEngine.ManagerClasses.Manager
 {

diff --git a/src/UniGetUI.PAckageEngine.Interfaces/ManagerProviders/IOperationProvider.cs b/src/UniGetUI.PAckageEngine.Interfaces/ManagerProviders/IOperationProvider.cs
@@ -20,7 +20,6 @@ OperationType operation
     /// </summary>
     public abstract OperationVeredict GetOperationResult(
         IPackage package,
-        IInstallationOptions options,
         OperationType operation,
         IEnumerable<string> processOutput,
         int returnCode

diff --git a/src/UniGetUI.PackageEngine.Enums/Enums.cs b/src/UniGetUI.PackageEngine.Enums/Enums.cs
@@ -31,6 +31,7 @@ public enum OperationVeredict
     {
         Succeeded,
         Failed,
+        Canceled,
         RestartRequired,
         AutoRetry,
     }
@@ -40,7 +41,7 @@ public enum OperationStatus
         Running,
         Succeeded,
         Failed,
-        Cancelled
+        Canceled
     }
 
     public enum OperationType

diff --git a/src/UniGetUI.PackageEngine.Enums/OverridenInstallationOptions.cs b/src/UniGetUI.PackageEngine.Enums/OverridenInstallationOptions.cs
@@ -0,0 +1,14 @@
+using UniGetUI.PackageEngine.Enums;
+
+namespace UniGetUI.PackageEngine.Structs;
+public struct OverridenInstallationOptions
+{
+    public PackageScope? Scope;
+    public bool? RunAsAdministrator;
+
+    public OverridenInstallationOptions(PackageScope? scope = null, bool? runAsAdministrator = null)
+    {
+        Scope = scope;
+        RunAsAdministrator = runAsAdministrator;
+    }
+}
diff --git a/src/UniGetUI.PackageEngine.Managers.Chocolatey/Chocolatey.cs b/src/UniGetUI.PackageEngine.Managers.Chocolatey/Chocolatey.cs
@@ -4,22 +4,20 @@
 using UniGetUI.Core.Logging;
 using UniGetUI.Core.SettingsEngine;
 using UniGetUI.Core.Tools;
-using UniGetUI.PackageEngine.Classes.Manager;
 using UniGetUI.Interface.Enums;
+using UniGetUI.PackageEngine.Classes.Manager;
 using UniGetUI.PackageEngine.Classes.Manager.ManagerHelpers;
 using UniGetUI.PackageEngine.Enums;
-using UniGetUI.PackageEngine.Interfaces;
+using UniGetUI.PackageEngine.ManagerClasses.Classes;
 using UniGetUI.PackageEngine.ManagerClasses.Manager;
 using UniGetUI.PackageEngine.Managers.Chocolatey;
 using UniGetUI.PackageEngine.Managers.PowerShellManager;
 using UniGetUI.PackageEngine.PackageClasses;
-using UniGetUI.PackageEngine.ManagerClasses.Classes;
 
 namespace UniGetUI.PackageEngine.Managers.ChocolateyManager
 {
     public class Chocolatey : BaseNuGet
     {
-        public static new string[] FALSE_PACKAGE_NAMES = [""];
         public static new string[] FALSE_PACKAGE_IDS = ["Directory", "", "Did", "Features?", "Validation", "-", "being", "It", "Error", "L'accs", "Maximum", "This", "Output is package name ", "operable", "Invalid"];
         public static new string[] FALSE_PACKAGE_VERSIONS = ["", "Did", "Features?", "Validation", "-", "being", "It", "Error", "L'accs", "Maximum", "This", "packages", "current version", "installed version", "is", "program", "validations", "argument", "no"];
 
@@ -63,7 +61,7 @@ public Chocolatey()
             PackageDetailsProvider = new ChocolateyDetailsProvider(this);
             OperationProvider = new ChocolateyOperationProvider(this);
         }
-        
+
         protected override async Task<Package[]> GetAvailableUpdates_UnSafe()
         {
             Process p = new()

diff --git a/src/UniGetUI.PackageEngine.Managers.Chocolatey/Providers/ChocolateyOperationProvider.cs b/src/UniGetUI.PackageEngine.Managers.Chocolatey/Providers/ChocolateyOperationProvider.cs
@@ -1,14 +1,7 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading.Tasks;
 using UniGetUI.PackageEngine.Classes.Manager.BaseProviders;
 using UniGetUI.PackageEngine.Enums;
 using UniGetUI.PackageEngine.Interfaces;
-using UniGetUI.PackageEngine.Managers.ChocolateyManager;
-using UniGetUI.PackageEngine.PackageClasses;
 
 namespace UniGetUI.PackageEngine.Managers.ChocolateyManager;
 internal sealed class ChocolateyOperationProvider : BaseOperationProvider<Chocolatey>
@@ -28,7 +21,7 @@ public override IEnumerable<string> GetOperationParameters(
         }];
         parameters.AddRange([package.Id, "-y"]);
 
-        if (options.CustomParameters is not null)
+        if (options.CustomParameters.Count > 0)
             parameters.AddRange(options.CustomParameters);
 
         if (options.InteractiveInstallation)
@@ -56,7 +49,6 @@ public override IEnumerable<string> GetOperationParameters(
 
     public override OperationVeredict GetOperationResult(
         IPackage package,
-        IInstallationOptions options,
         OperationType operation,
         IEnumerable<string> processOutput,
         int returnCode)
@@ -73,12 +65,12 @@ public override OperationVeredict GetOperationResult(
 
 
         string output_string = string.Join("\n", processOutput);
-        if (!options.RunAsAdministrator &&
+        if (!package.OverridenOptions.RunAsAdministrator != true &&
             (output_string.Contains("Run as administrator")
             || output_string.Contains("The requested operation requires elevation")
             || output_string.Contains("ERROR: Exception calling \"CreateDirectory\" with \"1\" argument(s): \"Access to the path")) )
         {
-            options.RunAsAdministrator = true;
+            package.OverridenOptions.RunAsAdministrator = true;
             return OperationVeredict.AutoRetry;
         }
 

diff --git a/src/UniGetUI.PackageEngine.Managers.Dotnet/DotNet.cs b/src/UniGetUI.PackageEngine.Managers.Dotnet/DotNet.cs
@@ -2,22 +2,21 @@
 using System.Runtime.InteropServices;
 using System.Text.RegularExpressions;
 using UniGetUI.Core.Tools;
-using UniGetUI.PackageEngine.Classes.Manager;
 using UniGetUI.Interface.Enums;
+using UniGetUI.PackageEngine.Classes.Manager;
 using UniGetUI.PackageEngine.Classes.Manager.Classes;
 using UniGetUI.PackageEngine.Classes.Manager.ManagerHelpers;
 using UniGetUI.PackageEngine.Enums;
-using UniGetUI.PackageEngine.Interfaces;
+using UniGetUI.PackageEngine.ManagerClasses.Classes;
 using UniGetUI.PackageEngine.ManagerClasses.Manager;
 using UniGetUI.PackageEngine.Managers.PowerShellManager;
 using UniGetUI.PackageEngine.PackageClasses;
-using UniGetUI.PackageEngine.ManagerClasses.Classes;
+using UniGetUI.PackageEngine.Structs;
 
 namespace UniGetUI.PackageEngine.Managers.DotNetManager
 {
     public class DotNet : BaseNuGet
     {
-        public static new string[] FALSE_PACKAGE_NAMES = [""];
         public static new string[] FALSE_PACKAGE_IDS = [""];
         public static new string[] FALSE_PACKAGE_VERSIONS = [""];
 
@@ -140,7 +139,15 @@ protected override async Task<Package[]> GetAvailableUpdates_UnSafe()
                         continue;
                     }
 
-                    Packages.Add(new Package(CoreTools.FormatAsName(elements[0]), elements[0], elements[1], elements[2], DefaultSource, this, PackageScope.Global));
+                    Packages.Add(new Package(
+                        CoreTools.FormatAsName(elements[0]),
+                        elements[0],
+                        elements[1],
+                        elements[2],
+                        DefaultSource,
+                        this,
+                        new(PackageScope.Global)
+                    ));
                 }
             }
             logger.AddToStdErr(await p.StandardError.ReadToEndAsync());
@@ -153,14 +160,14 @@ protected override async Task<Package[]> GetAvailableUpdates_UnSafe()
         protected override async Task<Package[]> GetInstalledPackages_UnSafe()
         {
             List<Package> Packages = [];
-            foreach (PackageScope scope in new PackageScope[] { PackageScope.Local, PackageScope.Global })
+            foreach (var options in new OverridenInstallationOptions[] { new(PackageScope.Local), new(PackageScope.Global) })
             {
                 Process p = new()
                 {
                     StartInfo = new ProcessStartInfo
                     {
                         FileName = Status.ExecutablePath,
-                        Arguments = Properties.ExecutableCallArgs + " list" + (scope == PackageScope.Global ? " --global" : ""),
+                        Arguments = Properties.ExecutableCallArgs + " list" + (options.Scope == PackageScope.Global ? " --global" : ""),
                         RedirectStandardOutput = true,
                         RedirectStandardError = true,
                         UseShellExecute = false,
@@ -202,7 +209,14 @@ protected override async Task<Package[]> GetInstalledPackages_UnSafe()
                             continue;
                         }
 
-                        Packages.Add(new Package(CoreTools.FormatAsName(elements[0]), elements[0], elements[1], DefaultSource, this, scope));
+                        Packages.Add(new Package(
+                            CoreTools.FormatAsName(elements[0]),
+                            elements[0],
+                            elements[1],
+                            DefaultSource,
+                            this,
+                            options
+                        ));
                     }
                 }
                 logger.AddToStdErr(await p.StandardError.ReadToEndAsync());

diff --git a/src/UniGetUI.PackageEngine.Managers.Dotnet/Providers/DotNetOperationProvider.cs b/src/UniGetUI.PackageEngine.Managers.Dotnet/Providers/DotNetOperationProvider.cs
@@ -1,15 +1,7 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading.Tasks;
 using UniGetUI.PackageEngine.Classes.Manager.BaseProviders;
 using UniGetUI.PackageEngine.Enums;
 using UniGetUI.PackageEngine.Interfaces;
-using UniGetUI.PackageEngine.Managers.DotNetManager;
-using UniGetUI.PackageEngine.PackageClasses;
-using Windows.ApplicationModel.Appointments;
 
 namespace UniGetUI.PackageEngine.Managers.DotNetManager;
 internal sealed class DotNetOperationProvider : BaseOperationProvider<DotNet>
@@ -35,7 +27,8 @@ public override IEnumerable<string> GetOperationParameters(
         if (options.CustomInstallLocation != "")
             parameters.AddRange(["--tool-path", "\"" + options.CustomInstallLocation + "\""]);
 
-        if (options.InstallationScope == PackageScope.Global || (options.InstallationScope is null && package.Scope == PackageScope.Global))
+        if(package.OverridenOptions.Scope == PackageScope.Global ||
+           (package.OverridenOptions.Scope is null && options.InstallationScope == PackageScope.Global))
             parameters.Add("--global");
 
         if (operation is OperationType.Install or OperationType.Update)
@@ -55,7 +48,6 @@ public override IEnumerable<string> GetOperationParameters(
 
     public override OperationVeredict GetOperationResult(
         IPackage package,
-        IInstallationOptions options,
         OperationType operation,
         IEnumerable<string> processOutput,
         int returnCode)