Merge pull request #53 from Corsinvest/release/v9.1.1

franklupo · web-flow · commit 2d4776a831fd · 2025-12-12T14:03:41.000+01:00
Release v9.1.1
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -3,7 +3,7 @@
 		<TargetFrameworks>net8.0;net9.0;net10.0;netstandard2.0</TargetFrameworks>
 		<LangVersion>latest</LangVersion>
 		<ImplicitUsings>enable</ImplicitUsings>
-		<Version>9.1.0</Version>
+		<Version>9.1.1</Version>
 		<!--<NoWarn>$(NoWarn);CS1591;CS0436</NoWarn>-->
 
 		<Company>Corsinvest Srl</Company>
diff --git a/src/Corsinvest.ProxmoxVE.Api.Console/Helpers/ShellHelper.cs b/src/Corsinvest.ProxmoxVE.Api.Console/Helpers/ShellHelper.cs
@@ -88,12 +88,14 @@ public static (string StandardOutput, int ExitCode) Execute(string cmd,
 
         if (dryRun)
         {
-            return ("", 0);
+            return (string.Empty, 0);
         }
         else
         {
             process.Start();
-            var standardOutput = redirectStandardOutput ? process.StandardOutput.ReadToEnd() : "";
+            var standardOutput = redirectStandardOutput 
+                                    ? process.StandardOutput.ReadToEnd() 
+                                    : string.Empty;
             var exitCode = 0;
             if (waitForExit)
             {
diff --git a/src/Corsinvest.ProxmoxVE.Api.Extension/ClientExtension.cs b/src/Corsinvest.ProxmoxVE.Api.Extension/ClientExtension.cs
@@ -114,7 +114,7 @@ public static async Task<IEnumerable<IClusterResourceVm>> GetVmsAsync(this PveCl
     /// <param name="vmId"></param>
     /// <returns></returns>
     public static async Task<IClusterResourceVm> GetVmAsync(this PveClient client, long vmId)
-        => await client.GetVmAsync(vmId + "");
+        => await client.GetVmAsync(vmId + string.Empty);
 
     /// <summary>
     /// Get VM/CT from id or name.
@@ -185,8 +185,8 @@ async Task<IEnumerable<IClusterResourceVm>> GetVmsFromIdAsync(string id)
             {
                 //all in specific tag
                 var tagName = id[5..];
-                data = allVms.Where(a => (a.Tags + "").ToLower().Split(';').Contains(tagName.ToLower())
-                                        || (a.Tags + "").Split(';').Contains(tagName));
+                data = allVms.Where(a => (a.Tags + string.Empty).ToLower().Split(';').Contains(tagName.ToLower())
+                                        || (a.Tags + string.Empty).Split(';').Contains(tagName));
             }
             else
             {
@@ -372,7 +372,7 @@ public static async Task<IEnumerable<string>> GetVmIdsAsync(this PveClient clien
         }
 
         var vms = resources.Where(a => a.ResourceType == ClusterResourceType.Vm && !a.IsUnknown);
-        if (addVmId) { vmIds.AddRange(vms.Select(a => a.VmId + "").OrderBy(a => a)); }
+        if (addVmId) { vmIds.AddRange(vms.Select(a => a.VmId + string.Empty).OrderBy(a => a)); }
         if (addVmName) { vmIds.AddRange(vms.Select(a => a.Name).OrderBy(a => a)); }
 
         return vmIds.Distinct();
diff --git a/src/Corsinvest.ProxmoxVE.Api.Extension/Utils/ApiExplorerHelper.cs b/src/Corsinvest.ProxmoxVE.Api.Extension/Utils/ApiExplorerHelper.cs
@@ -176,7 +176,7 @@ public string ToTable(bool verbose, TableGenerator.Output output)
                             ? ["name", "description", "command", "args", "sys"]
                             : new[] { "name", "description", "sys" };
 
-            static string EncodeSystem(bool system) => system ? "X" : "";
+            static string EncodeSystem(bool system) => system ? "X" : string.Empty;
 
             var rows = Alias.OrderByDescending(a => a.System)
                             .ThenBy(a => a.Name)
@@ -395,16 +395,17 @@ private static string CreateTableDynamic(dynamic data, string[] keys, TableGener
     {
         var columns = new List<string>();
         var rows = new List<object[]>();
+        var print = false;
 
         if (data is ExpandoObject)
         {
-            //dictionary
             var dic = (IDictionary<string, object>)data;
 
             columns.Add("key");
             columns.Add("value");
 
             keys ??= [.. dic.Select(a => a.Key)];
+            print = true;
 
             foreach (var key in keys.OrderBy(a => a))
             {
@@ -438,25 +439,29 @@ private static string CreateTableDynamic(dynamic data, string[] keys, TableGener
                         value = GetValue(value, title, returnParameters);
                     }
 
-                    value ??= "";
+                    value ??= string.Empty;
                     row.Add(value);
                 }
 
-                rowsTmp.Add(new KeyValuePair<object, object[]>(row[0] + "", [.. row]));
+                rowsTmp.Add(new KeyValuePair<object, object[]>(row[0] + string.Empty, [.. row]));
             }
 
             //order row by first column
             rows.AddRange([.. rowsTmp.OrderBy(a => a.Key).Select(a => a.Value)]);
-            if (rows.Count == 0) { data = ""; }
+            if (rows.Count == 0) { data = string.Empty; }
         }
 
         if (rows.Count > 0)
         {
             return TableGenerator.To(columns, rows, output);
         }
+        else if (print)
+        {
+            return string.Empty;
+        }
         else
         {
-            return data;
+            return data + string.Empty;
         }
     }
 
@@ -491,7 +496,7 @@ private static void CreateTable(IEnumerable<ParameterApi> parameters, StringBuil
                 if (!string.IsNullOrWhiteSpace(param.TypeText))
                 {
                     //explicit text
-                    partsType = JoinWord(param.TypeText.Split(' '), 18, "");
+                    partsType = JoinWord(param.TypeText.Split(' '), 18, string.Empty);
                 }
                 else if (param.EnumValues.Any())
                 {
@@ -501,9 +506,9 @@ private static void CreateTable(IEnumerable<ParameterApi> parameters, StringBuil
 
                 for (var i = 0; i < Math.Max(partsType.Length, partsComment.Length); i++)
                 {
-                    values.Add([ i == 0  ? param.Name : "",
-                                 i < partsType.Length ? partsType[i] : "",
-                                 i < partsComment.Length ? partsComment[i] : "" ]);
+                    values.Add([ i == 0  ? param.Name : string.Empty,
+                                 i < partsType.Length ? partsType[i] : string.Empty,
+                                 i < partsComment.Length ? partsComment[i] : string.Empty ]);
                 }
             }
 
@@ -550,7 +555,7 @@ public static string Usage(ClassApi classApiRoot,
                 //only parameters no keys
                 var parameters = method.Parameters.Where(a => !classApi.Keys.Contains(a.Name));
 
-                var opts = string.Join("", parameters.Where(a => !a.Optional).Select(a => $" {a.Name}:<{a.Type}>"));
+                var opts = string.Join(string.Empty, parameters.Where(a => !a.Optional).Select(a => $" {a.Name}:<{a.Type}>"));
                 if (!string.IsNullOrWhiteSpace(opts)) { ret.Append(opts); }
 
                 //optional parameter
@@ -609,7 +614,7 @@ private static string[] JoinWord(string[] words, int numChar, string separator)
                                                                                                                    string resource)
     {
         var values = new List<(string Attribute, string Value)>();
-        var error = "";
+        var error = string.Empty;
 
         var classApi = ClassApi.GetFromResource(classApiRoot, resource);
         if (classApi == null)
@@ -645,15 +650,15 @@ private static string[] JoinWord(string[] words, int numChar, string separator)
                                 var returnLinkHRef = classApi.Methods.FirstOrDefault(a => a.IsGet).ReturnLinkHRef;
                                 if (!string.IsNullOrWhiteSpace(returnLinkHRef))
                                 {
-                                    key = returnLinkHRef.Replace("{", "").Replace("}", "");
+                                    key = returnLinkHRef.Replace("{", string.Empty).Replace("}", string.Empty);
                                 }
                             }
 
                             if (result.ToData() != null && !string.IsNullOrWhiteSpace(key))
                             {
                                 var data = new List<object>();
                                 foreach (IDictionary<string, object> item in result.ToData()) { data.Add(item[key]); }
-                                foreach (var item in data.OrderBy(a => a)) { values.Add((attribute, item + "")); }
+                                foreach (var item in data.OrderBy(a => a)) { values.Add((attribute, item + string.Empty)); }
                             }
                         }
                     }
@@ -679,7 +684,9 @@ public static async Task<string> ListAsync(PveClient client, ClassApi classApiRo
     {
         var (values, error) = await ListValuesAsync(client, classApiRoot, resource);
         return string.Join(Environment.NewLine, values.Select(a => $"{a.Attribute}        {a.Value}")) +
-               (string.IsNullOrWhiteSpace(error) ? "" : Environment.NewLine + error) +
+               (string.IsNullOrWhiteSpace(error) 
+                    ? string.Empty 
+                    : Environment.NewLine + error) +
                Environment.NewLine;
     }
 }
diff --git a/src/Corsinvest.ProxmoxVE.Api.Extension/Utils/VmHelper.cs b/src/Corsinvest.ProxmoxVE.Api.Extension/Utils/VmHelper.cs
@@ -108,7 +108,7 @@ public static bool CheckIdOrName(IClusterResourceVm data, string vmIdOrName)
         {
             //string check name
             var name = data.Name.ToLower();
-            var vmIdOrNameLower = vmIdOrName.Replace("%", "").ToLower();
+            var vmIdOrNameLower = vmIdOrName.Replace("%", string.Empty).ToLower();
             if (vmIdOrName.Contains('%'))
             {
                 if (vmIdOrName.StartsWith("%") && vmIdOrName.EndsWith("%")) { return name.Contains(vmIdOrNameLower); }
@@ -196,7 +196,7 @@ public static async Task<IEnumerable<string>> GetVmsJollyKeysAsync(PveClient cli
         }
 
         var vms = resources.Where(a => a.ResourceType == ClusterResourceType.Vm && !a.IsUnknown);
-        if (addVmId) { vmIds.AddRange(vms.Select(a => a.VmId + "").OrderBy(a => a)); }
+        if (addVmId) { vmIds.AddRange(vms.Select(a => a.VmId + string.Empty).OrderBy(a => a)); }
         if (addVmName) { vmIds.AddRange(vms.Select(a => a.Name).OrderBy(a => a)); }
 
         return vmIds.Distinct();
diff --git a/src/Corsinvest.ProxmoxVE.Api.Metadata/ClassApi.cs b/src/Corsinvest.ProxmoxVE.Api.Metadata/ClassApi.cs
@@ -26,7 +26,7 @@ public class ClassApi
     public ClassApi(JToken token, ClassApi parent)
     {
         Name = token["text"].ToString().Replace("-", "_");
-        IndexName = Name.Replace("{", "").Replace("}", "");
+        IndexName = Name.Replace("{", string.Empty).Replace("}", string.Empty);
         Parent = parent;
         Resource = token["path"].ToString();
 
diff --git a/src/Corsinvest.ProxmoxVE.Api.Metadata/MethodApi.cs b/src/Corsinvest.ProxmoxVE.Api.Metadata/MethodApi.cs
@@ -21,13 +21,13 @@ public MethodApi(JToken token, ClassApi classApi)
     {
         MethodType = token["method"].ToString();
         MethodName = token["name"].ToString();
-        Comment = token["description"] + "";
+        Comment = token["description"] + string.Empty;
         ClassApi = classApi;
 
         var returns = token["returns"];
         if (returns != null)
         {
-            ReturnType = returns["type"] + "";
+            ReturnType = returns["type"] + string.Empty;
 
             if (returns["properties"] != null)
             {
diff --git a/src/Corsinvest.ProxmoxVE.Api.Metadata/ParameterApi.cs b/src/Corsinvest.ProxmoxVE.Api.Metadata/ParameterApi.cs
@@ -22,17 +22,17 @@ public class ParameterApi
     public ParameterApi(JToken token)
     {
         Name = ((JProperty)token.Parent).Name;
-        NameIndexed = Name.Replace("[n]", "");
+        NameIndexed = Name.Replace("[n]", string.Empty);
         IsIndexed = Name.EndsWith("[n]");
-        Description = token["description"] + "";
-        VerboseDescription = token["verbose_description"] + "";
+        Description = token["description"] + string.Empty;
+        VerboseDescription = token["verbose_description"] + string.Empty;
         Optional = (token["optional"] ?? 0).ToString() == "1";
-        Type = token["type"] + "";
-        TypeText = token["typetext"] + "";
+        Type = token["type"] + string.Empty;
+        TypeText = token["typetext"] + string.Empty;
         Maximum = token["maximum"] == null ? null : (long?)token["maximum"];
         Minimum = token["minimum"] == null ? null : (int?)token["minimum"];
-        Renderer = token["renderer"] + "";
-        Default = token["default"] == null ? null : token["default"] + "";
+        Renderer = token["renderer"] + string.Empty;
+        Default = token["default"] == null ? null : token["default"] + string.Empty;
 
         if (token["properties"] != null)
         {
@@ -111,11 +111,11 @@ public object RendererValue(object value)
             case "fraction_as_percentage":
                 value = double.TryParse(value.ToString(), out var perValue) && perValue > 0
                         ? Math.Round(perValue * 100, 2) + "%"
-                        : "";
+                        : string.Empty;
                 break;
 
             case "bytes":
-                if (long.TryParse(value.ToString(), out var bytesValue) && bytesValue > 0)
+                if (value != null && long.TryParse(value.ToString(), out var bytesValue) && bytesValue > 0)
                 {
                     var sizes = new string[] { "B", "KiB", "MiB", "GiB", "TiB" };
                     var order = 0;
@@ -125,36 +125,17 @@ public object RendererValue(object value)
                         bytesValue /= 1024;
                     }
                     value = $"{bytesValue} {sizes[order]}";
-
-
-                    // if (bytesValue > Math.Pow(1024, 4))
-                    // {
-                    //     value = Math.Round(bytesValue / Math.Pow(1024, 4), 2) + " TiB";
-                    // }
-                    // else if (bytesValue > Math.Pow(1024, 3))
-                    // {
-                    //     value = Math.Round(bytesValue / Math.Pow(1024, 3), 2) + " GiB";
-                    // }
-                    // else if (bytesValue > Math.Pow(1024, 2))
-                    // {
-                    //     value = Math.Round(bytesValue / Math.Pow(1024, 2), 2) + " MiB";
-                    // }
-                    // else if (bytesValue > 1024)
-                    // {
-                    //     value = Math.Round(bytesValue / 1024.0, 0) + " KiB";
-                    // }
-                    // else { value = bytesValue + " B"; }
                 }
                 else
                 {
-                    value = "";
+                    value = string.Empty;
                 }
                 break;
 
             case "duration":
                 value = int.TryParse(value.ToString(), out var duration) && duration > 0
                             ? new TimeSpan(0, 0, duration).ToString(@"d\d\ h\h\ m\m\ ss\s")
-                            : "";
+                            : string.Empty;
                 break;
 
             case "timestamp": break;
diff --git a/src/Corsinvest.ProxmoxVE.Api.Metadata/ParameterFormatApi.cs b/src/Corsinvest.ProxmoxVE.Api.Metadata/ParameterFormatApi.cs
@@ -19,15 +19,15 @@ public class ParameterFormatApi
     public ParameterFormatApi(JToken token)
     {
         Name = ((JProperty)token.Parent).Name;
-        Description = token["description"] + "";
+        Description = token["description"] + string.Empty;
         Optional = (token["optional"] ?? 0).ToString() == "1";
-        Type = token["type"] + "";
+        Type = token["type"] + string.Empty;
         Maximum = token["maximum"] == null ? null : (int?)token["maximum"];
         Minimum = token["minimum"] == null ? null : (int?)token["minimum"];
-        DefaultKey = token["default_key"] + "";
-        FormatDescription = token["format_description"] + "";
-        Format = token["format"] + "";
-        Alias = token["alias"] + "";
+        DefaultKey = token["default_key"] + string.Empty;
+        FormatDescription = token["format_description"] + string.Empty;
+        Format = token["format"] + string.Empty;
+        Alias = token["alias"] + string.Empty;
         MaxLength = token["maxLength"] == null ? null : (int?)token["maxLength"];
 
         #region create enum values
diff --git a/src/Corsinvest.ProxmoxVE.Api.Shared/Models/Cluster/ClusterExtension.cs b/src/Corsinvest.ProxmoxVE.Api.Shared/Models/Cluster/ClusterExtension.cs
@@ -60,7 +60,7 @@ public static void ImproveData(this IClusterResourceBase data)
             var s when s == PveConstants.KeyApiStorage => $"{((IStorageItem)data).Storage} ({data.Node})",
             var s when s == PveConstants.KeyApiQemu || s == PveConstants.KeyApiLxc => $"{((IVmBase)data).VmId} ({((IVmBase)data).Name})",
             var s when s == PveConstants.KeyApiPool => ((IPoolItem)data).Pool,
-            _ => "",
+            _ => string.Empty,
         };
 
         data.IsUnknown = data.Status == PveConstants.StatusUnknown;
diff --git a/src/Corsinvest.ProxmoxVE.Api.Shared/Models/Node/NodeTask.cs b/src/Corsinvest.ProxmoxVE.Api.Shared/Models/Node/NodeTask.cs
@@ -70,7 +70,7 @@ public string DurationInfo
     {
         get
         {
-            var durationInfo = "";
+            var durationInfo = string.Empty;
             if (Duration.HasValue)
             {
                 var duration = Duration.Value;
diff --git a/src/Corsinvest.ProxmoxVE.Api.Shared/Models/Vm/VmConfig.cs b/src/Corsinvest.ProxmoxVE.Api.Shared/Models/Vm/VmConfig.cs
@@ -125,7 +125,7 @@ private void ReadNetworks()
                 var network = new VmNetwork();
                 network.Id = key;
 
-                foreach (var item in (ExtensionData[key] + "").Split(','))
+                foreach (var item in (ExtensionData[key] + string.Empty).Split(','))
                 {
                     Match match;
                     if (this is VmConfigQemu)
@@ -233,7 +233,7 @@ private void ReadDisks()
         var disks = new List<VmDisk>();
         foreach (var key in ExtensionData.Keys)
         {
-            var def = ExtensionData[key] + "";
+            var def = ExtensionData[key] + string.Empty;
             if (key == "rootfs"
                 //bus match
                 || (Regex.IsMatch(key, @"(efidisk|tpmstate|virtio|ide|scsi|sata|mp)\d+") && !Regex.IsMatch(def, "media=cdrom")))
diff --git a/src/Corsinvest.ProxmoxVE.Api.Shared/Utils/FormatHelper.cs b/src/Corsinvest.ProxmoxVE.Api.Shared/Utils/FormatHelper.cs
@@ -87,7 +87,7 @@ public static string UsageInfo(ulong usage, ulong size)
     /// <returns></returns>
     public static string UptimeInfo(double value)
         => value == 0
-            ? ""
+            ? string.Empty
             : string.Format($"{TimeSpan.FromSeconds(Convert.ToDouble(value)):d' days 'hh':'mm':'ss}");
 
     /// <summary>
@@ -105,6 +105,6 @@ public static string ContentToDescription(string content)
             "rootdir" => "Container",
             "snippets" => "Snippets",
             "import" => "Import",
-            _ => "",
+            _ => string.Empty,
         };
 }
diff --git a/src/Corsinvest.ProxmoxVE.Api.Shared/Utils/TableGenerator.cs b/src/Corsinvest.ProxmoxVE.Api.Shared/Utils/TableGenerator.cs
diff --git a/src/Corsinvest.ProxmoxVE.Api/ResultExtension.cs b/src/Corsinvest.ProxmoxVE.Api/ResultExtension.cs

Original file line number	Diff line number	Diff line change
`@@ -88,12 +88,14 @@ public static (string StandardOutput, int ExitCode) Execute(string cmd,`
`88`	`88`
`89`	`89`	`if (dryRun)`
`90`	`90`	`{`
`91`		`- return ("", 0);`
	`91`	`+ return (string.Empty, 0);`
`92`	`92`	`}`
`93`	`93`	`else`
`94`	`94`	`{`
`95`	`95`	`process.Start();`
`96`		`- var standardOutput = redirectStandardOutput ? process.StandardOutput.ReadToEnd() : "";`
	`96`	`+ var standardOutput = redirectStandardOutput`
	`97`	`+ ? process.StandardOutput.ReadToEnd()`
	`98`	`+ : string.Empty;`
`97`	`99`	`var exitCode = 0;`
`98`	`100`	`if (waitForExit)`
`99`	`101`	`{`
Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ public static async Task<IEnumerable<IClusterResourceVm>> GetVmsAsync(this PveCl`
`114`	`114`	`/// <param name="vmId"></param>`
`115`	`115`	`/// <returns></returns>`
`116`	`116`	`public static async Task<IClusterResourceVm> GetVmAsync(this PveClient client, long vmId)`
`117`		`- => await client.GetVmAsync(vmId + "");`
	`117`	`+ => await client.GetVmAsync(vmId + string.Empty);`
`118`	`118`
`119`	`119`	`/// <summary>`
`120`	`120`	`/// Get VM/CT from id or name.`
`@@ -185,8 +185,8 @@ async Task<IEnumerable<IClusterResourceVm>> GetVmsFromIdAsync(string id)`
`185`	`185`	`{`
`186`	`186`	`//all in specific tag`
`187`	`187`	`var tagName = id[5..];`
`188`		`- data = allVms.Where(a => (a.Tags + "").ToLower().Split(';').Contains(tagName.ToLower())`
`189`		`- \|\| (a.Tags + "").Split(';').Contains(tagName));`
	`188`	`+ data = allVms.Where(a => (a.Tags + string.Empty).ToLower().Split(';').Contains(tagName.ToLower())`
	`189`	`+ \|\| (a.Tags + string.Empty).Split(';').Contains(tagName));`
`190`	`190`	`}`
`191`	`191`	`else`
`192`	`192`	`{`
`@@ -372,7 +372,7 @@ public static async Task<IEnumerable<string>> GetVmIdsAsync(this PveClient clien`
`372`	`372`	`}`
`373`	`373`
`374`	`374`	`var vms = resources.Where(a => a.ResourceType == ClusterResourceType.Vm && !a.IsUnknown);`
`375`		`- if (addVmId) { vmIds.AddRange(vms.Select(a => a.VmId + "").OrderBy(a => a)); }`
	`375`	`+ if (addVmId) { vmIds.AddRange(vms.Select(a => a.VmId + string.Empty).OrderBy(a => a)); }`
`376`	`376`	`if (addVmName) { vmIds.AddRange(vms.Select(a => a.Name).OrderBy(a => a)); }`
`377`	`377`
`378`	`378`	`return vmIds.Distinct();`
Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ public string ToTable(bool verbose, TableGenerator.Output output)`
`176`	`176`	`? ["name", "description", "command", "args", "sys"]`
`177`	`177`	`: new[] { "name", "description", "sys" };`
`178`	`178`
`179`		`- static string EncodeSystem(bool system) => system ? "X" : "";`
	`179`	`+ static string EncodeSystem(bool system) => system ? "X" : string.Empty;`
`180`	`180`
`181`	`181`	`var rows = Alias.OrderByDescending(a => a.System)`
`182`	`182`	`.ThenBy(a => a.Name)`
`@@ -395,16 +395,17 @@ private static string CreateTableDynamic(dynamic data, string[] keys, TableGener`
`395`	`395`	`{`
`396`	`396`	`var columns = new List<string>();`
`397`	`397`	`var rows = new List<object[]>();`
	`398`	`+ var print = false;`
`398`	`399`
`399`	`400`	`if (data is ExpandoObject)`
`400`	`401`	`{`
`401`		`- //dictionary`
`402`	`402`	`var dic = (IDictionary<string, object>)data;`
`403`	`403`
`404`	`404`	`columns.Add("key");`
`405`	`405`	`columns.Add("value");`
`406`	`406`
`407`	`407`	`keys ??= [.. dic.Select(a => a.Key)];`
	`408`	`+ print = true;`
`408`	`409`
`409`	`410`	`foreach (var key in keys.OrderBy(a => a))`
`410`	`411`	`{`
`@@ -438,25 +439,29 @@ private static string CreateTableDynamic(dynamic data, string[] keys, TableGener`
`438`	`439`	`value = GetValue(value, title, returnParameters);`
`439`	`440`	`}`
`440`	`441`
`441`		`- value ??= "";`
	`442`	`+ value ??= string.Empty;`
`442`	`443`	`row.Add(value);`
`443`	`444`	`}`
`444`	`445`
`445`		`- rowsTmp.Add(new KeyValuePair<object, object[]>(row[0] + "", [.. row]));`
	`446`	`+ rowsTmp.Add(new KeyValuePair<object, object[]>(row[0] + string.Empty, [.. row]));`
`446`	`447`	`}`
`447`	`448`
`448`	`449`	`//order row by first column`
`449`	`450`	`rows.AddRange([.. rowsTmp.OrderBy(a => a.Key).Select(a => a.Value)]);`
`450`		`- if (rows.Count == 0) { data = ""; }`
	`451`	`+ if (rows.Count == 0) { data = string.Empty; }`
`451`	`452`	`}`
`452`	`453`
`453`	`454`	`if (rows.Count > 0)`
`454`	`455`	`{`
`455`	`456`	`return TableGenerator.To(columns, rows, output);`
`456`	`457`	`}`
	`458`	`+ else if (print)`
	`459`	`+ {`
	`460`	`+ return string.Empty;`
	`461`	`+ }`
`457`	`462`	`else`
`458`	`463`	`{`
`459`		`- return data;`
	`464`	`+ return data + string.Empty;`
`460`	`465`	`}`
`461`	`466`	`}`
`462`	`467`
`@@ -491,7 +496,7 @@ private static void CreateTable(IEnumerable<ParameterApi> parameters, StringBuil`
`491`	`496`	`if (!string.IsNullOrWhiteSpace(param.TypeText))`
`492`	`497`	`{`
`493`	`498`	`//explicit text`
`494`		`- partsType = JoinWord(param.TypeText.Split(' '), 18, "");`
	`499`	`+ partsType = JoinWord(param.TypeText.Split(' '), 18, string.Empty);`
`495`	`500`	`}`
`496`	`501`	`else if (param.EnumValues.Any())`
`497`	`502`	`{`
`@@ -501,9 +506,9 @@ private static void CreateTable(IEnumerable<ParameterApi> parameters, StringBuil`
`501`	`506`
`502`	`507`	`for (var i = 0; i < Math.Max(partsType.Length, partsComment.Length); i++)`
`503`	`508`	`{`
`504`		`- values.Add([ i == 0 ? param.Name : "",`
`505`		`- i < partsType.Length ? partsType[i] : "",`
`506`		`- i < partsComment.Length ? partsComment[i] : "" ]);`
	`509`	`+ values.Add([ i == 0 ? param.Name : string.Empty,`
	`510`	`+ i < partsType.Length ? partsType[i] : string.Empty,`
	`511`	`+ i < partsComment.Length ? partsComment[i] : string.Empty ]);`
`507`	`512`	`}`
`508`	`513`	`}`
`509`	`514`
`@@ -550,7 +555,7 @@ public static string Usage(ClassApi classApiRoot,`
`550`	`555`	`//only parameters no keys`
`551`	`556`	`var parameters = method.Parameters.Where(a => !classApi.Keys.Contains(a.Name));`
`552`	`557`
`553`		`- var opts = string.Join("", parameters.Where(a => !a.Optional).Select(a => $" {a.Name}:<{a.Type}>"));`
	`558`	`+ var opts = string.Join(string.Empty, parameters.Where(a => !a.Optional).Select(a => $" {a.Name}:<{a.Type}>"));`
`554`	`559`	`if (!string.IsNullOrWhiteSpace(opts)) { ret.Append(opts); }`
`555`	`560`
`556`	`561`	`//optional parameter`
`@@ -609,7 +614,7 @@ private static string[] JoinWord(string[] words, int numChar, string separator)`
`609`	`614`	`string resource)`
`610`	`615`	`{`
`611`	`616`	`var values = new List<(string Attribute, string Value)>();`
`612`		`- var error = "";`
	`617`	`+ var error = string.Empty;`
`613`	`618`
`614`	`619`	`var classApi = ClassApi.GetFromResource(classApiRoot, resource);`
`615`	`620`	`if (classApi == null)`
`@@ -645,15 +650,15 @@ private static string[] JoinWord(string[] words, int numChar, string separator)`
`645`	`650`	`var returnLinkHRef = classApi.Methods.FirstOrDefault(a => a.IsGet).ReturnLinkHRef;`
`646`	`651`	`if (!string.IsNullOrWhiteSpace(returnLinkHRef))`
`647`	`652`	`{`
`648`		`- key = returnLinkHRef.Replace("{", "").Replace("}", "");`
	`653`	`+ key = returnLinkHRef.Replace("{", string.Empty).Replace("}", string.Empty);`
`649`	`654`	`}`
`650`	`655`	`}`
`651`	`656`
`652`	`657`	`if (result.ToData() != null && !string.IsNullOrWhiteSpace(key))`
`653`	`658`	`{`
`654`	`659`	`var data = new List<object>();`
`655`	`660`	`foreach (IDictionary<string, object> item in result.ToData()) { data.Add(item[key]); }`
`656`		`- foreach (var item in data.OrderBy(a => a)) { values.Add((attribute, item + "")); }`
	`661`	`+ foreach (var item in data.OrderBy(a => a)) { values.Add((attribute, item + string.Empty)); }`
`657`	`662`	`}`
`658`	`663`	`}`
`659`	`664`	`}`
`@@ -679,7 +684,9 @@ public static async Task<string> ListAsync(PveClient client, ClassApi classApiRo`
`679`	`684`	`{`
`680`	`685`	`var (values, error) = await ListValuesAsync(client, classApiRoot, resource);`
`681`	`686`	`return string.Join(Environment.NewLine, values.Select(a => $"{a.Attribute} {a.Value}")) +`
`682`		`- (string.IsNullOrWhiteSpace(error) ? "" : Environment.NewLine + error) +`
	`687`	`+ (string.IsNullOrWhiteSpace(error)`
	`688`	`+ ? string.Empty`
	`689`	`+ : Environment.NewLine + error) +`
`683`	`690`	`Environment.NewLine;`
`684`	`691`	`}`
`685`	`692`	`}`
Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ public static bool CheckIdOrName(IClusterResourceVm data, string vmIdOrName)`
`108`	`108`	`{`
`109`	`109`	`//string check name`
`110`	`110`	`var name = data.Name.ToLower();`
`111`		`- var vmIdOrNameLower = vmIdOrName.Replace("%", "").ToLower();`
	`111`	`+ var vmIdOrNameLower = vmIdOrName.Replace("%", string.Empty).ToLower();`
`112`	`112`	`if (vmIdOrName.Contains('%'))`
`113`	`113`	`{`
`114`	`114`	`if (vmIdOrName.StartsWith("%") && vmIdOrName.EndsWith("%")) { return name.Contains(vmIdOrNameLower); }`
`@@ -196,7 +196,7 @@ public static async Task<IEnumerable<string>> GetVmsJollyKeysAsync(PveClient cli`
`196`	`196`	`}`
`197`	`197`
`198`	`198`	`var vms = resources.Where(a => a.ResourceType == ClusterResourceType.Vm && !a.IsUnknown);`
`199`		`- if (addVmId) { vmIds.AddRange(vms.Select(a => a.VmId + "").OrderBy(a => a)); }`
	`199`	`+ if (addVmId) { vmIds.AddRange(vms.Select(a => a.VmId + string.Empty).OrderBy(a => a)); }`
`200`	`200`	`if (addVmName) { vmIds.AddRange(vms.Select(a => a.Name).OrderBy(a => a)); }`
`201`	`201`
`202`	`202`	`return vmIds.Distinct();`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public class ClassApi`
`26`	`26`	`public ClassApi(JToken token, ClassApi parent)`
`27`	`27`	`{`
`28`	`28`	`Name = token["text"].ToString().Replace("-", "_");`
`29`		`- IndexName = Name.Replace("{", "").Replace("}", "");`
	`29`	`+ IndexName = Name.Replace("{", string.Empty).Replace("}", string.Empty);`
`30`	`30`	`Parent = parent;`
`31`	`31`	`Resource = token["path"].ToString();`
`32`	`32`
Original file line number	Diff line number	Diff line change
`@@ -21,13 +21,13 @@ public MethodApi(JToken token, ClassApi classApi)`
`21`	`21`	`{`
`22`	`22`	`MethodType = token["method"].ToString();`
`23`	`23`	`MethodName = token["name"].ToString();`
`24`		`- Comment = token["description"] + "";`
	`24`	`+ Comment = token["description"] + string.Empty;`
`25`	`25`	`ClassApi = classApi;`
`26`	`26`
`27`	`27`	`var returns = token["returns"];`
`28`	`28`	`if (returns != null)`
`29`	`29`	`{`
`30`		`- ReturnType = returns["type"] + "";`
	`30`	`+ ReturnType = returns["type"] + string.Empty;`
`31`	`31`
`32`	`32`	`if (returns["properties"] != null)`
`33`	`33`	`{`