Merge pull request #44 from basicx-StrgV/feature-winget-query-rework

Feature winget query rework into dev

Author: basicx-StrgV

src/WGet.NET/Components/WinGet.cs

@@ -22,12 +22,6 @@ namespace WGetNET
     /// </summary>
     public class WinGet
     {
-        private const string _infoCmd = "--info";
-        private const string _versionCmd = "--version";
-        private const string _exportSettingsCmd = "settings export";
-        private const string _settingsEnableCmd = "settings --enable \"{0}\"";
-        private const string _settingsDisableCmd = "settings --disable \"{0}\"";
-
         private ProcessManager _processManager;
         private string _wingetExePath;
         private DateTime _wingetExeModificationDate;
@@ -154,7 +148,7 @@ public WinGet()
         /// </exception>
         public string ExportSettings()
         {
-            ProcessResult result = Execute(_exportSettingsCmd);
+            ProcessResult result = Execute(WinGetArguments.SettingsExport());
 
             return ProcessOutputReader.ExportOutputToString(result);
         }
@@ -174,7 +168,7 @@ public string ExportSettings()
         /// </exception>
         public async Task<string> ExportSettingsAsync(CancellationToken cancellationToken = default)
         {
-            ProcessResult result = await ExecuteAsync(_exportSettingsCmd, false, cancellationToken);
+            ProcessResult result = await ExecuteAsync(WinGetArguments.SettingsExport(), false, cancellationToken);
 
             return ProcessOutputReader.ExportOutputToString(result);
         }
@@ -222,7 +216,7 @@ public void ExportSettingsToFile(string file)
             ArgsHelper.ThrowIfStringIsNullOrWhiteSpace(file, "file");
             ArgsHelper.ThrowIfPathIsInvalid(file);
 
-            ProcessResult result = Execute(_exportSettingsCmd);
+            ProcessResult result = Execute(WinGetArguments.SettingsExport());
 
             FileHelper.WriteTextToFile(file, ProcessOutputReader.ExportOutputToString(result));
         }
@@ -273,7 +267,7 @@ public async Task ExportSettingsToFileAsync(string file, CancellationToken cance
             ArgsHelper.ThrowIfStringIsNullOrWhiteSpace(file, "file");
             ArgsHelper.ThrowIfPathIsInvalid(file);
 
-            ProcessResult result = await ExecuteAsync(_exportSettingsCmd, false, cancellationToken);
+            ProcessResult result = await ExecuteAsync(WinGetArguments.SettingsExport(), false, cancellationToken);
 
             await FileHelper.WriteTextToFileAsync(file, ProcessOutputReader.ExportOutputToString(result), cancellationToken);
         }
@@ -396,9 +390,7 @@ public bool EnableAdminSetting(string settingName)
         {
             ArgsHelper.ThrowIfStringIsNullOrWhiteSpace(settingName, "settingName");
 
-            string cmd = string.Format(_settingsEnableCmd, settingName);
-
-            ProcessResult result = Execute(cmd, true);
+            ProcessResult result = Execute(WinGetArguments.Settings().Enable(settingName), true);
 
             return result.Success;
         }
@@ -460,9 +452,7 @@ public async Task<bool> EnableAdminSettingAsync(string settingName, Cancellation
         {
             ArgsHelper.ThrowIfStringIsNullOrWhiteSpace(settingName, "settingName");
 
-            string cmd = string.Format(_settingsEnableCmd, settingName);
-
-            ProcessResult result = await ExecuteAsync(cmd, true, cancellationToken);
+            ProcessResult result = await ExecuteAsync(WinGetArguments.Settings().Enable(settingName), true, cancellationToken);
 
             return result.Success;
         }
@@ -524,9 +514,7 @@ public bool DisableAdminSetting(string settingName)
         {
             ArgsHelper.ThrowIfStringIsNullOrWhiteSpace(settingName, "settingName");
 
-            string cmd = string.Format(_settingsDisableCmd, settingName);
-
-            ProcessResult result = Execute(cmd, true);
+            ProcessResult result = Execute(WinGetArguments.Settings().Disable(settingName), true);
 
             return result.Success;
         }
@@ -588,9 +576,7 @@ public async Task<bool> DisableAdminSettingAsync(string settingName, Cancellatio
         {
             ArgsHelper.ThrowIfStringIsNullOrWhiteSpace(settingName, "settingName");
 
-            string cmd = string.Format(_settingsDisableCmd, settingName);
-
-            ProcessResult result = await ExecuteAsync(cmd, true, cancellationToken);
+            ProcessResult result = await ExecuteAsync(WinGetArguments.Settings().Disable(settingName), true, cancellationToken);
 
             return result.Success;
         }
@@ -640,7 +626,7 @@ public async Task<bool> DisableAdminSettingAsync(WinGetAdminSetting setting, Can
         /// </exception>
         public WinGetInfo GetInfo()
         {
-            ProcessResult result = Execute(_infoCmd);
+            ProcessResult result = Execute(WinGetArguments.WinGet().Info());
 
             InfoActionVersionId actionVersionId = InfoActionVersionId.VersionRange1;
             if (CheckWinGetVersion(new Version(1, 4, 3531), new Version(1, 5, 101)))
@@ -674,7 +660,7 @@ public WinGetInfo GetInfo()
         /// </exception>
         public async Task<WinGetInfo> GetInfoAsync(CancellationToken cancellationToken = default)
         {
-            ProcessResult result = await ExecuteAsync(_infoCmd, false, cancellationToken);
+            ProcessResult result = await ExecuteAsync(WinGetArguments.WinGet().Info(), false, cancellationToken);
 
             // Check the version range the action should be performed for
             InfoActionVersionId actionVersionId = InfoActionVersionId.VersionRange1;
@@ -731,7 +717,7 @@ private protected bool CheckWinGetVersion(Version minVersion, Version? maxVersio
         /// Exectutes a WinGet action from the given cmd.
         /// </summary>
         /// <param name="args">
-        /// A <see cref="System.String"/> containing the arguments for the WinGet process.
+        /// A <see cref="WGetNET.WinGetArguments"/> object containing the arguments for the WinGet process.
         /// </param>
         /// <param name="needsAdminRights">
         /// Sets if the process that should be executed needs administrator privileges.
@@ -746,7 +732,7 @@ private protected bool CheckWinGetVersion(Version minVersion, Version? maxVersio
         /// The current process does not have administrator privileges. 
         /// (Only if <paramref name="needsAdminRights"/> is set to <see langword="true"/>)
         /// </exception>
-        private protected ProcessResult Execute(string args, bool needsAdminRights = false)
+        private protected ProcessResult Execute(WinGetArguments args, bool needsAdminRights = false)
         {
             ThrowIfNotInstalled();
 
@@ -755,14 +741,14 @@ private protected ProcessResult Execute(string args, bool needsAdminRights = fal
                 ThrowIfNotAdmin();
             }
 
-            return _processManager.ExecuteWingetProcess(args);
+            return _processManager.ExecuteWingetProcess(args.Arguments);
         }
 
         /// <summary>
         /// Asynchronously exectutes a WinGet action from the given cmd.
         /// </summary>
         /// <param name="args">
-        /// A <see cref="System.String"/> containing the arguments for the WinGet process.
+        /// A <see cref="WGetNET.WinGetArguments"/> object containing the arguments for the WinGet process.
         /// </param>
         /// <param name="needsAdminRights">
         /// Sets if the process that should be executed needs administrator privileges.
@@ -781,7 +767,7 @@ private protected ProcessResult Execute(string args, bool needsAdminRights = fal
         /// The current process does not have administrator privileges.
         /// (Only if <paramref name="needsAdminRights"/> is set to <see langword="true"/>)
         /// </exception>
-        private protected async Task<ProcessResult> ExecuteAsync(string args, bool needsAdminRights = false, CancellationToken cancellationToken = default)
+        private protected async Task<ProcessResult> ExecuteAsync(WinGetArguments args, bool needsAdminRights = false, CancellationToken cancellationToken = default)
         {
             ThrowIfNotInstalled();
 
@@ -790,7 +776,7 @@ private protected async Task<ProcessResult> ExecuteAsync(string args, bool needs
                 ThrowIfNotAdmin();
             }
 
-            return await _processManager.ExecuteWingetProcessAsync(args, cancellationToken);
+            return await _processManager.ExecuteWingetProcessAsync(args.Arguments, cancellationToken);
         }
         // \endcond
         //---------------------------------------------------------------------------------------------
@@ -837,7 +823,7 @@ private string CheckWinGetVersion()
                 return string.Empty;
             }
 
-            ProcessResult result = Execute(_versionCmd);
+            ProcessResult result = Execute(WinGetArguments.WinGet().Version());
 
             for (int i = 0; i < result.Output.Length; i++)
             {