allow to configure column separator, rename options

Author: hyperblast

src/CommandLineTool/Commands/ClientOptionsCommand.cs

@@ -33,10 +33,10 @@ public override Task OnExecuteAsync(CancellationToken ct)
             var allValues = accessor.GetAllValues().ToList();
 
             console.WriteLine("Single value:");
-            WriteOptions(allValues.Where(v => v.isMultiValue == false));
+            WriteOptions(allValues.Where(v => !v.isMultiValue));
             console.WriteLine();
             console.WriteLine("Multiple values:");
-            WriteOptions(allValues.Where(v => v.isMultiValue == true));
+            WriteOptions(allValues.Where(v => v.isMultiValue));
 
             return Task.CompletedTask;
         }
@@ -55,17 +55,22 @@ public override Task OnExecuteAsync(CancellationToken ct)
             return Task.CompletedTask;
         }
 
-        writer.WriteRow(accessor.GetValues(Name));
+        writer.WriteRow(accessor.GetValues(Name).Select(Quote).ToList());
         return Task.CompletedTask;
     }
 
     private void WriteOptions(IEnumerable<(string name, bool isMultiValue, List<string> values)> allValues)
     {
         var rows = allValues
             .OrderBy(a => a.name)
-            .Select(a => (string[]) ["  " + a.name, ..a.values])
+            .Select(a => (string[]) ["  " + a.name, ..a.values.Select(Quote)])
             .ToList();
 
         writer.WriteTable(rows);
     }
+
+    private static string Quote(string s)
+    {
+        return s.Length > 0 && char.IsWhiteSpace(s[0]) || char.IsWhiteSpace(s[^1]) ? $"\"{s}\"" : s;
+    }
 }

src/CommandLineTool/Commands/ListCommand.cs

@@ -30,15 +30,15 @@ public class ListCommand(IClientProvider clientProvider, ISettingsStorage storag
     public bool IndicesFrom0 { get; set; }
 
     [Option(T.Separator, Description = D.Separator)]
-    public string Separator { get; set; } = " | ";
+    public string? Separator { get; set; }
 
     public string[]? RemainingArguments { get; set; }
 
     public override async Task OnExecuteAsync(CancellationToken ct)
     {
         await base.OnExecuteAsync(ct);
 
-        var columns = Columns.GetOrDefault(storage.Settings.ListFormat);
+        var columns = Columns.GetOrDefault(storage.Settings.ListColumns);
         var playlist = await Client.GetPlaylist(Playlist, IndicesFrom0, ct);
         var itemRange = new PlaylistItemRange(0, 100);
 
@@ -63,7 +63,7 @@ public override async Task OnExecuteAsync(CancellationToken ct)
         writer.WriteTable(rows, new TableWriteOptions
         {
             RightAlign = [ShowIndices],
-            Separator = Separator
+            Separator = Separator.GetOrDefault(storage.Settings.ColumnSeparator)
         });
     }
 }

src/CommandLineTool/Commands/QueueCommand.cs

@@ -29,13 +29,13 @@ public class QueueCommand(IClientProvider clientProvider, ISettingsStorage stora
     public bool IndicesFrom0 { get; set; }
 
     [Option(T.Separator, Description = D.Separator)]
-    public string Separator { get; set; } = " | ";
+    public string? Separator { get; set; }
 
     public override async Task OnExecuteAsync(CancellationToken ct)
     {
         await base.OnExecuteAsync(ct);
 
-        var columns = Columns.GetOrDefault(storage.Settings.PlayQueueFormat);
+        var columns = Columns.GetOrDefault(storage.Settings.PlayQueueColumns);
         var queue = await Client.GetPlayQueue(columns, ct);
         var baseIndex = IndicesFrom0 ? 0 : 1;
         var data = queue.Select(q => GetItemColumns(q, baseIndex));
@@ -47,7 +47,7 @@ public override async Task OnExecuteAsync(CancellationToken ct)
         writer.WriteTable(rows, new TableWriteOptions
         {
             RightAlign = [ShowIndices],
-            Separator = Separator
+            Separator = Separator.GetOrDefault(storage.Settings.ColumnSeparator)
         });
     }
 

src/CommandLineTool/Services/Settings.cs

@@ -9,13 +9,15 @@ public sealed class Settings
 
     public string? DefaultServer { get; set; }
 
+    public string ColumnSeparator { get; set; } = "";
+
     public string NowPlayingFormat { get; set; } = "";
 
     public string StatusFormat { get; set; } = "";
 
-    public List<string> ListFormat { get; set; } = new();
+    public List<string> ListColumns { get; set; } = new();
 
-    public List<string> PlayQueueFormat { get; set; } = new();
+    public List<string> PlayQueueColumns { get; set; } = new();
 
     public bool IsDefaultServer(string name) => string.Equals(name, DefaultServer, StringComparison.OrdinalIgnoreCase);
 
@@ -28,10 +30,11 @@ public static Settings CreateDefault()
             {
                 { Constants.LocalServerName, new Uri(Constants.LocalServerUrl) }
             },
+            ColumnSeparator = " | ",
             NowPlayingFormat = "%artist% - %title%",
             StatusFormat = "%artist% - %title%",
-            ListFormat = ["%artist%", "%album%", "%title%"],
-            PlayQueueFormat = ["%artist%", "%album%", "%title%"],
+            ListColumns = ["%artist%", "%album%", "%title%"],
+            PlayQueueColumns = ["%artist%", "%album%", "%title%"],
         };
     }
 }

src/CommandLineTool/Services/SettingsAccessor.cs

@@ -61,6 +61,10 @@ static SettingsAccessor()
     {
         var accessors = new Dictionary<string, AccessorEntry>(StringComparer.OrdinalIgnoreCase)
         {
+            {
+                nameof(Settings.ColumnSeparator),
+                (false, s => [s.ColumnSeparator], (s, v) => s.ColumnSeparator = v.First())
+            },
             {
                 nameof(Settings.NowPlayingFormat),
                 (false, s => [s.NowPlayingFormat], (s, v) => s.NowPlayingFormat = v.First())
@@ -70,12 +74,12 @@ static SettingsAccessor()
                 (false, s => [s.StatusFormat], (s, v) => s.StatusFormat = v.First())
             },
             {
-                nameof(Settings.ListFormat),
-                (true, s => s.ListFormat, (s, v) => s.ListFormat = v.ToList())
+                nameof(Settings.ListColumns),
+                (true, s => s.ListColumns, (s, v) => s.ListColumns = v.ToList())
             },
             {
-                nameof(Settings.PlayQueueFormat),
-                (true, s => s.PlayQueueFormat, (s, v) => s.PlayQueueFormat = v.ToList())
+                nameof(Settings.PlayQueueColumns),
+                (true, s => s.PlayQueueColumns, (s, v) => s.PlayQueueColumns = v.ToList())
             },
         };