Moved WinGet base class cmd's to the WinGetArguments class

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,11 @@ public WinGet()
         /// </exception>
         public string ExportSettings()
         {
-            ProcessResult result = Execute(_exportSettingsCmd);
+            ProcessResult result =
+                Execute(
+                    WinGetArguments
+                    .SettingsExport()
+                    .ToString());
 
             return ProcessOutputReader.ExportOutputToString(result);
         }
@@ -174,7 +172,12 @@ 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()
+                    .ToString(),
+                    false, cancellationToken);
 
             return ProcessOutputReader.ExportOutputToString(result);
         }
@@ -222,7 +225,11 @@ public void ExportSettingsToFile(string file)
             ArgsHelper.ThrowIfStringIsNullOrWhiteSpace(file, "file");
             ArgsHelper.ThrowIfPathIsInvalid(file);
 
-            ProcessResult result = Execute(_exportSettingsCmd);
+            ProcessResult result =
+                Execute(
+                    WinGetArguments
+                    .SettingsExport()
+                    .ToString());
 
             FileHelper.WriteTextToFile(file, ProcessOutputReader.ExportOutputToString(result));
         }
@@ -273,7 +280,12 @@ 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()
+                    .ToString(),
+                    false, cancellationToken);
 
             await FileHelper.WriteTextToFileAsync(file, ProcessOutputReader.ExportOutputToString(result), cancellationToken);
         }
@@ -396,9 +408,13 @@ 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)
+                    .ToString(),
+                    true);
 
             return result.Success;
         }
@@ -460,9 +476,13 @@ 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)
+                    .ToString(),
+                    true, cancellationToken);
 
             return result.Success;
         }
@@ -524,9 +544,13 @@ 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)
+                    .ToString(),
+                    true);
 
             return result.Success;
         }
@@ -588,9 +612,13 @@ 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)
+                    .ToString(),
+                    true, cancellationToken);
 
             return result.Success;
         }
@@ -640,7 +668,12 @@ public async Task<bool> DisableAdminSettingAsync(WinGetAdminSetting setting, Can
         /// </exception>
         public WinGetInfo GetInfo()
         {
-            ProcessResult result = Execute(_infoCmd);
+            ProcessResult result =
+                Execute(
+                    WinGetArguments
+                    .WinGet()
+                    .Info()
+                    .ToString());
 
             InfoActionVersionId actionVersionId = InfoActionVersionId.VersionRange1;
             if (CheckWinGetVersion(new Version(1, 4, 3531), new Version(1, 5, 101)))
@@ -674,7 +707,13 @@ 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()
+                    .ToString(),
+                    false, cancellationToken);
 
             // Check the version range the action should be performed for
             InfoActionVersionId actionVersionId = InfoActionVersionId.VersionRange1;
@@ -837,7 +876,12 @@ private string CheckWinGetVersion()
                 return string.Empty;
             }
 
-            ProcessResult result = Execute(_versionCmd);
+            ProcessResult result =
+                Execute(
+                    WinGetArguments
+                    .WinGet()
+                    .Version()
+                    .ToString());
 
             for (int i = 0; i < result.Output.Length; i++)
             {

src/WGet.NET/Data/WinGetArguments.cs

@@ -11,6 +11,9 @@ internal class WinGetArguments : IWinGetObject
     {
         internal enum WinGetAction
         {
+            None,
+            Settings,
+            SettingsExport,
             List,
             Search,
             Install,
@@ -34,7 +37,7 @@ public string Arguments
         {
             get
             {
-                return _arguments;
+                return _arguments.Trim();
             }
         }
 
@@ -67,6 +70,40 @@ internal WinGetArguments(string baseCmd, WinGetAction action)
         }
 
         //---Base Cmd's--------------------------------------------------------------------------------
+        /// <summary>
+        /// Creates a new winget arguments object with no base cmd. 
+        /// Used for direct callin of the winget cmd with flags.
+        /// </summary>
+        /// <returns>
+        /// The created <see cref="WGetNET.WinGetArguments"/> object.
+        /// </returns>
+        public static WinGetArguments WinGet()
+        {
+            return new WinGetArguments("", WinGetAction.None);
+        }
+
+        /// <summary>
+        /// Creates a new winget arguments object with "settings" as the base cmd.
+        /// </summary>
+        /// <returns>
+        /// The created <see cref="WGetNET.WinGetArguments"/> object.
+        /// </returns>
+        public static WinGetArguments Settings()
+        {
+            return new WinGetArguments("settings", WinGetAction.Settings);
+        }
+
+        /// <summary>
+        /// Creates a new winget arguments object with "settings export" as the base cmd.
+        /// </summary>
+        /// <returns>
+        /// The created <see cref="WGetNET.WinGetArguments"/> object.
+        /// </returns>
+        public static WinGetArguments SettingsExport()
+        {
+            return new WinGetArguments("settings export", WinGetAction.SettingsExport);
+        }
+
         /// <summary>
         /// Creates a new winget arguments object with "list" as the base cmd.
         /// </summary>
@@ -321,6 +358,36 @@ public WinGetArguments Directory(string directory)
             return this;
         }
 
+        /// <summary>
+        /// Adds a enable action to the arguments.
+        /// </summary>
+        /// <param name="query">
+        /// A <see cref="System.String"/> containing the option to enable.
+        /// </param>
+        /// <returns>
+        /// The updated <see cref="WGetNET.WinGetArguments"/> object.
+        /// </returns>
+        public WinGetArguments Enable(string query)
+        {
+            _arguments += $" --enable \"{query}\"";
+            return this;
+        }
+
+        /// <summary>
+        /// Adds a disable action to the arguments.
+        /// </summary>
+        /// <param name="query">
+        /// A <see cref="System.String"/> containing the option to disable.
+        /// </param>
+        /// <returns>
+        /// The updated <see cref="WGetNET.WinGetArguments"/> object.
+        /// </returns>
+        public WinGetArguments Disable(string query)
+        {
+            _arguments += $" --disable \"{query}\"";
+            return this;
+        }
+
         /// <summary>
         /// Adds a version query to the arguments.
         /// </summary>
@@ -336,6 +403,18 @@ public WinGetArguments Version(string version)
             return this;
         }
 
+        /// <summary>
+        /// Adds a version query to the arguments.
+        /// </summary>
+        /// <returns>
+        /// The updated <see cref="WGetNET.WinGetArguments"/> object.
+        /// </returns>
+        public WinGetArguments Version()
+        {
+            _arguments += $" --version";
+            return this;
+        }
+
         /// <summary>
         /// Adds the '--exact' flag to the arguments.
         /// </summary>
@@ -456,11 +535,23 @@ public WinGetArguments Force()
             return this;
         }
 
+        /// <summary>
+        /// Adds the '--info' flag to the arguments.
+        /// </summary>
+        /// <returns>
+        /// The updated <see cref="WGetNET.WinGetArguments"/> object.
+        /// </returns>
+        public WinGetArguments Info()
+        {
+            _arguments += " --info";
+            return this;
+        }
+
         //---Others------------------------------------------------------------------------------------
         /// <inheritdoc/>
         public override string ToString()
         {
-            return _arguments;
+            return _arguments.Trim();
         }
     }
 }