IPackageManager and PackageManager will not implement the PackageProv…

…iders
marticliment · Nov 20, 2024 · 814ad60 · 814ad60
1 parent e9c5fc9
commit 814ad60
Show file tree

Hide file tree

Showing 35 changed files with 230 additions and 335 deletions.
diff --git a/src/UniGetUI.PAckageEngine.Interfaces/IPackageManager.cs b/src/UniGetUI.PAckageEngine.Interfaces/IPackageManager.cs
@@ -5,7 +5,7 @@
 
 namespace UniGetUI.PackageEngine.Interfaces
 {
-    public interface IPackageManager : ISourceProvider, IPackageDetailsProvider, IOperationProvider
+    public interface IPackageManager
     {
         public ManagerProperties Properties { get; }
         public ManagerCapabilities Capabilities { get; }
@@ -15,10 +15,9 @@ public interface IPackageManager : ISourceProvider, IPackageDetailsProvider, IOp
         public IManagerSource DefaultSource { get; }
         public bool ManagerReady { get; }
         public IManagerLogger TaskLogger { get; }
-
         public ISourceProvider? SourceProvider { get; }
-        public IPackageDetailsProvider? PackageDetailsProvider { get; }
-        public IOperationProvider? OperationProvider { get; }
+        public IPackageDetailsProvider PackageDetailsProvider { get; }
+        public IOperationProvider OperationProvider { get; }
 
         /// <summary>
         /// Initializes the Package Manager (asynchronously). Must be run before using any other method of the manager.
@@ -67,8 +66,5 @@ public interface IPackageManager : ISourceProvider, IPackageDetailsProvider, IOp
         /// an example
         /// </summary>
         public void AttemptFastRepair();
-
-        public IManagerSource GetSourceOrDefault(string SourceName);
-        public IManagerSource? GetSourceIfExists(string SourceName);
     }
 }
diff --git a/src/UniGetUI.PAckageEngine.Interfaces/ManagerProviders/ISourceProvider.cs b/src/UniGetUI.PAckageEngine.Interfaces/ManagerProviders/ISourceProvider.cs
@@ -4,7 +4,7 @@ namespace UniGetUI.PackageEngine.Interfaces.ManagerProviders
 {
     public interface ISourceProvider
     {
-        public ISourceFactory SourceFactory { get; }
+        public ISourceFactory Factory { get; }
 
         /// <summary>
         /// Returns the command-line parameters required to add the given source to the manager.
@@ -43,5 +43,7 @@ public interface ISourceProvider
         /// </summary>
         /// <returns>An array of ManagerSource objects</returns>
         public IEnumerable<IManagerSource> GetSources();
+
+
     }
 }
diff --git a/src/UniGetUI.PackageEngine.Managers.Cargo/Providers/CargoOperationProvider.cs b/src/UniGetUI.PackageEngine.Managers.Cargo/Providers/CargoOperationProvider.cs
@@ -6,7 +6,7 @@ namespace UniGetUI.PackageEngine.Managers.CargoManager;
 
 internal sealed class CargoOperationProvider(Cargo cargo) : BaseOperationProvider<Cargo>(cargo)
 {
-    public override IEnumerable<string> GetOperationParameters(IPackage package, IInstallationOptions options, OperationType operation)
+    protected override IEnumerable<string> _getOperationParameters(IPackage package, IInstallationOptions options, OperationType operation)
     {
         var version = options.Version == string.Empty ? package.Version : options.Version;
         List<string> parameters = operation switch
@@ -20,7 +20,7 @@ public override IEnumerable<string> GetOperationParameters(IPackage package, IIn
         return parameters;
     }
 
-    public override OperationVeredict GetOperationResult(IPackage package, OperationType operation, IEnumerable<string> processOutput, int returnCode)
+    protected override OperationVeredict _getOperationResult(IPackage package, OperationType operation, IEnumerable<string> processOutput, int returnCode)
     {
         return returnCode == 0 ? OperationVeredict.Succeeded : OperationVeredict.Failed;
     }

diff --git a/src/UniGetUI.PackageEngine.Managers.Chocolatey/Providers/ChocolateyOperationProvider.cs b/src/UniGetUI.PackageEngine.Managers.Chocolatey/Providers/ChocolateyOperationProvider.cs
@@ -8,7 +8,7 @@ internal sealed class ChocolateyOperationProvider : BaseOperationProvider<Chocol
 {
     public ChocolateyOperationProvider(Chocolatey manager) : base(manager) { }
 
-    public override IEnumerable<string> GetOperationParameters(
+    protected override IEnumerable<string> _getOperationParameters(
         IPackage package,
         IInstallationOptions options,
         OperationType operation)
@@ -47,7 +47,7 @@ public override IEnumerable<string> GetOperationParameters(
         return parameters;
     }
 
-    public override OperationVeredict GetOperationResult(
+    protected override OperationVeredict _getOperationResult(
         IPackage package,
         OperationType operation,
         IEnumerable<string> processOutput,

diff --git a/src/UniGetUI.PackageEngine.Managers.Dotnet/Providers/DotNetOperationProvider.cs b/src/UniGetUI.PackageEngine.Managers.Dotnet/Providers/DotNetOperationProvider.cs
@@ -8,7 +8,7 @@ internal sealed class DotNetOperationProvider : BaseOperationProvider<DotNet>
 {
     public DotNetOperationProvider(DotNet manager) : base(manager) { }
 
-    public override IEnumerable<string> GetOperationParameters(
+    protected override IEnumerable<string> _getOperationParameters(
         IPackage package,
         IInstallationOptions options,
         OperationType operation)
@@ -46,7 +46,7 @@ public override IEnumerable<string> GetOperationParameters(
         return parameters;
     }
 
-    public override OperationVeredict GetOperationResult(
+    protected override OperationVeredict _getOperationResult(
         IPackage package,
         OperationType operation,
         IEnumerable<string> processOutput,

diff --git a/src/UniGetUI.PackageEngine.Managers.Generic.NuGet/BaseNuGet.cs b/src/UniGetUI.PackageEngine.Managers.Generic.NuGet/BaseNuGet.cs
@@ -46,7 +46,7 @@ protected sealed override IEnumerable<Package> FindPackages_UnSafe(string query)
             IEnumerable<IManagerSource> sources;
             if (Capabilities.SupportsCustomSources)
             {
-                sources = GetSources();
+                sources = SourceProvider.GetSources();
             }
             else
             {

diff --git a/src/UniGetUI.PackageEngine.Managers.Npm/Providers/NpmOperationProvider.cs b/src/UniGetUI.PackageEngine.Managers.Npm/Providers/NpmOperationProvider.cs
@@ -7,7 +7,7 @@ internal sealed class NpmOperationProvider : BaseOperationProvider<Npm>
 {
     public NpmOperationProvider(Npm manager) : base(manager) { }
 
-    public override IEnumerable<string> GetOperationParameters(IPackage package, IInstallationOptions options, OperationType operation)
+    protected override IEnumerable<string> _getOperationParameters(IPackage package, IInstallationOptions options, OperationType operation)
     {
         List<string> parameters = operation switch {
             OperationType.Install => [Manager.Properties.InstallVerb, $"{package.Id}@{(options.Version == string.Empty? package.Version: options.Version)}"],
@@ -30,7 +30,7 @@ public override IEnumerable<string> GetOperationParameters(IPackage package, IIn
         return parameters;
     }
 
-    public override OperationVeredict GetOperationResult(
+    protected override OperationVeredict _getOperationResult(
         IPackage package,
         OperationType operation,
         IEnumerable<string> processOutput,

diff --git a/src/UniGetUI.PackageEngine.Managers.Pip/Providers/PipOperationProvider.cs b/src/UniGetUI.PackageEngine.Managers.Pip/Providers/PipOperationProvider.cs
@@ -7,7 +7,7 @@ internal sealed class PipOperationProvider : BaseOperationProvider<Pip>
 {
     public PipOperationProvider(Pip manager) : base(manager) { }
 
-    public override IEnumerable<string> GetOperationParameters(
+    protected override IEnumerable<string> _getOperationParameters(
         IPackage package,
         IInstallationOptions options,
         OperationType operation)
@@ -46,7 +46,7 @@ public override IEnumerable<string> GetOperationParameters(
         return parameters;
     }
 
-    public override OperationVeredict GetOperationResult(
+    protected override OperationVeredict _getOperationResult(
         IPackage package,
         OperationType operation,
         IEnumerable<string> processOutput,

diff --git a/src/UniGetUI.PackageEngine.Managers.PowerShell/PowerShell.cs b/src/UniGetUI.PackageEngine.Managers.PowerShell/PowerShell.cs
@@ -6,6 +6,7 @@
 using UniGetUI.PackageEngine.Classes.Manager;
 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;
 using UniGetUI.PackageEngine.Managers.Chocolatey;
@@ -130,7 +131,8 @@ function Test-GalleryModuleUpdate {
                     continue;
                 }
 
-                Packages.Add(new Package(CoreTools.FormatAsName(elements[0]), elements[0], elements[1], elements[2], GetSourceOrDefault(elements[3]), this));
+                Packages.Add(new Package(CoreTools.FormatAsName(elements[0]), elements[0], elements[1],
+                    elements[2], SourceProvider.Factory.GetSourceOrDefault(elements[3]), this));
             }
 
             logger.AddToStdErr(p.StandardError.ReadToEnd());
@@ -186,7 +188,8 @@ protected override IEnumerable<Package> GetInstalledPackages_UnSafe()
                         elements[i] = elements[i].Trim();
                     }
 
-                    Packages.Add(new Package(CoreTools.FormatAsName(elements[1]), elements[1], elements[0], GetSourceOrDefault(elements[2]), this));
+                    Packages.Add(new Package(CoreTools.FormatAsName(elements[1]), elements[1], elements[0],
+                        SourceProvider.Factory.GetSourceOrDefault(elements[2]), this));
                 }
             }
 
@@ -220,7 +223,7 @@ protected override ManagerStatus LoadManager()
                     RedirectStandardOutput = true,
                     RedirectStandardError = true,
                     CreateNoWindow = true,
-                    StandardOutputEncoding = System.Text.Encoding.UTF8
+                    StandardOutputEncoding = Encoding.UTF8
                 }
             };
             process.Start();

diff --git a/src/UniGetUI.PackageEngine.Managers.PowerShell/Providers/PowerShellOperationProvider.cs b/src/UniGetUI.PackageEngine.Managers.PowerShell/Providers/PowerShellOperationProvider.cs
@@ -7,7 +7,7 @@ internal sealed class PowerShellOperationProvider : BaseOperationProvider<PowerS
 {
     public PowerShellOperationProvider(PowerShell manager) : base(manager) { }
 
-    public override IEnumerable<string> GetOperationParameters(IPackage package, IInstallationOptions options, OperationType operation)
+    protected override IEnumerable<string> _getOperationParameters(IPackage package, IInstallationOptions options, OperationType operation)
     {
         List<string> parameters = [operation switch {
             OperationType.Install => Manager.Properties.InstallVerb,
@@ -48,7 +48,7 @@ public override IEnumerable<string> GetOperationParameters(IPackage package, IIn
         return parameters;
     }
 
-    public override OperationVeredict GetOperationResult(
+    protected override OperationVeredict _getOperationResult(
         IPackage package,
         OperationType operation,
         IEnumerable<string> processOutput,

diff --git a/src/UniGetUI.PackageEngine.Managers.PowerShell7/PowerShell7.cs b/src/UniGetUI.PackageEngine.Managers.PowerShell7/PowerShell7.cs
@@ -131,7 +131,8 @@ function Test-GalleryModuleUpdate {
                     continue;
                 }
 
-                Packages.Add(new Package(CoreTools.FormatAsName(elements[0]), elements[0], elements[1], elements[2], GetSourceOrDefault(elements[3]), this));
+                Packages.Add(new Package(CoreTools.FormatAsName(elements[0]), elements[0], elements[1],
+                    elements[2], SourceProvider.Factory.GetSourceOrDefault(elements[3]), this));
             }
 
             logger.AddToStdErr(p.StandardError.ReadToEnd());
@@ -187,7 +188,8 @@ protected override IEnumerable<Package> GetInstalledPackages_UnSafe()
                         elements[i] = elements[i].Trim();
                     }
 
-                    Packages.Add(new Package(CoreTools.FormatAsName(elements[0]), elements[0], elements[1], GetSourceOrDefault(elements[2]), this));
+                    Packages.Add(new Package(CoreTools.FormatAsName(elements[0]), elements[0], elements[1],
+                        SourceProvider.Factory.GetSourceOrDefault(elements[2]), this));
                 }
             }
 

diff --git a/src/UniGetUI.PackageEngine.Managers.PowerShell7/Providers/PowerShell7OperationProvider.cs b/src/UniGetUI.PackageEngine.Managers.PowerShell7/Providers/PowerShell7OperationProvider.cs
@@ -7,7 +7,7 @@ internal sealed class PowerShell7OperationProvider : BaseOperationProvider<Power
 {
     public PowerShell7OperationProvider(PowerShell7 manager) : base(manager) { }
 
-    public override IEnumerable<string> GetOperationParameters(IPackage package, IInstallationOptions options, OperationType operation)
+    protected override IEnumerable<string> _getOperationParameters(IPackage package, IInstallationOptions options, OperationType operation)
     {
         List<string> parameters = [operation switch {
             OperationType.Install => Manager.Properties.InstallVerb,
@@ -44,7 +44,7 @@ public override IEnumerable<string> GetOperationParameters(IPackage package, IIn
         return parameters;
     }
 
-    public override OperationVeredict GetOperationResult(
+    protected override OperationVeredict _getOperationResult(
         IPackage package,
         OperationType operation,
         IEnumerable<string> processOutput,

diff --git a/src/UniGetUI.PackageEngine.Managers.Scoop/Providers/ScoopOperationProvider.cs b/src/UniGetUI.PackageEngine.Managers.Scoop/Providers/ScoopOperationProvider.cs
@@ -8,7 +8,7 @@ internal sealed class ScoopOperationProvider : BaseOperationProvider<Scoop>
 {
     public ScoopOperationProvider(Scoop manager) : base(manager) { }
 
-    public override IEnumerable<string> GetOperationParameters(IPackage package, IInstallationOptions options, OperationType operation)
+    protected override IEnumerable<string> _getOperationParameters(IPackage package, IInstallationOptions options, OperationType operation)
     {
         List<string> parameters = [operation switch {
             OperationType.Install => Manager.Properties.InstallVerb,
@@ -55,7 +55,7 @@ public override IEnumerable<string> GetOperationParameters(IPackage package, IIn
         return parameters;
     }
 
-    public override OperationVeredict GetOperationResult(
+    protected override OperationVeredict _getOperationResult(
         IPackage package,
         OperationType operation,
         IEnumerable<string> processOutput,

diff --git a/src/UniGetUI.PackageEngine.Managers.Scoop/Scoop.cs b/src/UniGetUI.PackageEngine.Managers.Scoop/Scoop.cs
@@ -144,7 +144,7 @@ protected override IEnumerable<Package> FindPackages_UnSafe(string query)
                 if (line.StartsWith("'"))
                 {
                     string sourceName = line.Split(" ")[0].Replace("'", "");
-                    source = GetSourceOrDefault(sourceName);
+                    source = SourceProvider.Factory.GetSourceOrDefault(sourceName);
                 }
                 else if (line.Trim() != "")
                 {
@@ -325,7 +325,7 @@ private IEnumerable<Package> _getInstalledPackages_UnSafe()
                         CoreTools.FormatAsName(elements[0]),
                         elements[0],
                         elements[1],
-                        GetSourceOrDefault(elements[2]),
+                        SourceProvider.Factory.GetSourceOrDefault(elements[2]),
                         this,
                         options));
                 }

diff --git a/src/UniGetUI.PackageEngine.Managers.Vcpkg/Providers/VcpkgOperationProvider.cs b/src/UniGetUI.PackageEngine.Managers.Vcpkg/Providers/VcpkgOperationProvider.cs
@@ -9,7 +9,7 @@ internal sealed class VcpkgOperationProvider : BaseOperationProvider<Vcpkg>
 {
     public VcpkgOperationProvider(Vcpkg manager) : base(manager) { }
 
-    public override IEnumerable<string> GetOperationParameters(IPackage package, IInstallationOptions options, OperationType operation)
+    protected override IEnumerable<string> _getOperationParameters(IPackage package, IInstallationOptions options, OperationType operation)
     {
         List<string> parameters = operation switch {
             OperationType.Install => [Manager.Properties.InstallVerb, package.Id],
@@ -22,7 +22,7 @@ public override IEnumerable<string> GetOperationParameters(IPackage package, IIn
         return parameters;
     }
 
-    public override OperationVeredict GetOperationResult(
+    protected override OperationVeredict _getOperationResult(
         IPackage package,
         OperationType operation,
         IEnumerable<string> processOutput,

diff --git a/src/UniGetUI.PackageEngine.Managers.Vcpkg/Providers/VcpkgSourceProvider.cs b/src/UniGetUI.PackageEngine.Managers.Vcpkg/Providers/VcpkgSourceProvider.cs
@@ -27,7 +27,7 @@ protected override OperationVeredict _getRemoveSourceOperationVeredict(IManagerS
         protected override IEnumerable<IManagerSource> GetSources_UnSafe()
         {
             List<ManagerSource> Sources = [];
-            
+
 			foreach (string Triplet in Vcpkg.GetSystemTriplets()) {
 				Sources.Add(new ManagerSource(Manager, Triplet, Vcpkg.URI_VCPKG_IO));
 			}

diff --git a/src/UniGetUI.PackageEngine.Managers.WinGet/Providers/WinGetOperationProvider.cs b/src/UniGetUI.PackageEngine.Managers.WinGet/Providers/WinGetOperationProvider.cs
@@ -21,7 +21,7 @@ public static string GetIdNamePiece(IPackage package)
 
     public WinGetOperationProvider(WinGet manager) : base(manager) { }
 
-    public override IEnumerable<string> GetOperationParameters(IPackage package, IInstallationOptions options, OperationType operation)
+    protected override IEnumerable<string> _getOperationParameters(IPackage package, IInstallationOptions options, OperationType operation)
     {
         List<string> parameters = [operation switch {
             OperationType.Install => Manager.Properties.InstallVerb,
@@ -108,7 +108,7 @@ public override IEnumerable<string> GetOperationParameters(IPackage package, IIn
         return parameters;
     }
 
-    public override OperationVeredict GetOperationResult(
+    protected override OperationVeredict _getOperationResult(
         IPackage package,
         OperationType operation,
         IEnumerable<string> processOutput,

diff --git a/src/UniGetUI.PackageEngine.Managers.WinGet/WinGetHelpers/BundledWinGetHelper.cs b/src/UniGetUI.PackageEngine.Managers.WinGet/WinGetHelpers/BundledWinGetHelper.cs
@@ -103,7 +103,7 @@ public IEnumerable<Package> GetAvailableUpdates_UnSafe()
                 else
                 {
                     string sourceName = line[(SourceIndex - offset)..].Trim().Split(' ')[0];
-                    source = Manager.GetSourceOrDefault(sourceName);
+                    source = Manager.SourceProvider.Factory.GetSourceOrDefault(sourceName);
                 }
 
                 Packages.Add(new Package(name, id, version, newVersion, source, Manager));
@@ -190,7 +190,7 @@ public IEnumerable<Package> GetInstalledPackages_UnSafe()
                     else
                     {
                         string sourceName = line[(SourceIndex - offset)..].Trim().Split(' ')[0].Trim();
-                        source = Manager.GetSourceOrDefault(sourceName);
+                        source = Manager.SourceProvider.Factory.GetSourceOrDefault(sourceName);
                     }
                     Packages.Add(new Package(name, id, version, source, Manager));
                 }
@@ -267,7 +267,7 @@ public IEnumerable<Package> FindPackages_UnSafe(string query)
                 else
                 {
                     string sourceName = line[(SourceIndex - offset)..].Trim().Split(' ')[0];
-                    source = Manager.GetSourceOrDefault(sourceName);
+                    source = Manager.SourceProvider.Factory.GetSourceOrDefault(sourceName);
                 }
                 Packages.Add(new Package(name, id, version, source, Manager));
             }

diff --git a/src/UniGetUI.PackageEngine.Managers.WinGet/WinGetHelpers/NativeWinGetHelper.cs b/src/UniGetUI.PackageEngine.Managers.WinGet/WinGetHelpers/NativeWinGetHelper.cs
@@ -115,7 +115,7 @@ public IEnumerable<Package> FindPackages_UnSafe(string query)
             try
             {
                 // Get the source for the catalog
-                IManagerSource source = Manager.GetSourceOrDefault(CatalogTaskPair.Key.Item1.Info.Name);
+                IManagerSource source = Manager.SourceProvider.Factory.GetSourceOrDefault(CatalogTaskPair.Key.Item1.Info.Name);
 
                 FindPackagesResult FoundPackages = CatalogTaskPair.Value.Result;
                 foreach (MatchResult matchResult in FoundPackages.Matches.ToArray())
@@ -127,15 +127,6 @@ public IEnumerable<Package> FindPackages_UnSafe(string query)
 
                     var overriden_options = new OverridenInstallationOptions();
 
-                    /*var installOptions = Factory.CreateInstallOptions();
-                    if (catPkg.DefaultInstallVersion.HasApplicableInstaller(installOptions))
-                    {
-                        var options = catPkg.DefaultInstallVersion.GetApplicableInstaller(installOptions);
-                        if (options.ElevationRequirement is ElevationRequirement.ElevationRequired or ElevationRequirement.ElevatesSelf)
-                            overriden_options.RunAsAdministrator = true;
-                        else if (options.ElevationRequirement is ElevationRequirement.ElevationProhibited)
-                            overriden_options.RunAsAdministrator = false;
-                    }*/
                     var UniGetUIPackage = new Package(
                         nativePackage.Name,
                         nativePackage.Id,
@@ -168,7 +159,7 @@ public IEnumerable<Package> GetAvailableUpdates_UnSafe()
             if (nativePackage.IsUpdateAvailable)
             {
                 IManagerSource source;
-                source = Manager.GetSourceOrDefault(nativePackage.DefaultInstallVersion.PackageCatalog.Info.Name);
+                source = Manager.SourceProvider.Factory.GetSourceOrDefault(nativePackage.DefaultInstallVersion.PackageCatalog.Info.Name);
 
                 var UniGetUIPackage = new Package(
                     nativePackage.Name,
@@ -197,7 +188,7 @@ public IEnumerable<Package> GetInstalledPackages_UnSafe()
             IManagerSource source;
             if (nativePackage.DefaultInstallVersion is not null)
             {
-                source = Manager.GetSourceOrDefault(nativePackage.DefaultInstallVersion.PackageCatalog.Info.Name);
+                source = Manager.SourceProvider.Factory.GetSourceOrDefault(nativePackage.DefaultInstallVersion.PackageCatalog.Info.Name);
             }
             else
             {