Merge pull request #313 from DougSchmidt-AI/feature/PF-1448-ExelCsvExtractorImprovements

PF-1448 - Default to a comma, with no trailing space, as the separator

Author: Doug Schmidt

TimeSeries/PublicApis/SdkExamples/ExcelCsvExtractor/Context.cs

@@ -10,5 +10,6 @@ public class Context
         public bool Overwrite { get; set; }
         public string DateTimeFormat { get; set; }
         public bool TrimEmptyColumns { get; set; } = true;
+        public string ColumnSeparator { get; set; } = ",";
     }
 }

TimeSeries/PublicApis/SdkExamples/ExcelCsvExtractor/Program.cs

@@ -100,6 +100,13 @@ private static Context GetContext(string[] args)
                     Description = $"Output path of CSVs (default: {{{Splitter.ExcelPathPattern}}}.{{{Splitter.SheetNamePattern}}}.csv"
                 },
                 new Option
+                {
+                    Key = nameof(context.ColumnSeparator),
+                    Setter = value => context.ColumnSeparator = value,
+                    Getter = ()=> context.ColumnSeparator,
+                    Description = "Separator between columns"
+                },
+                new Option
                 {
                     Key = nameof(context.Overwrite),
                     Setter = value => context.Overwrite = bool.Parse(value),
@@ -127,7 +134,7 @@ var usageMessage
                       + $"\n"
                       + $"\nusage: {GetProgramName()} [-option=value] [@optionsFile] [location] ..."
                       + $"\n"
-                      + $"\nSupported -option=value settings (/option=value works too):\n\n  -{string.Join("\n  -", options.Select(o => o.UsageText()))}"
+                      + $"\nSupported -option=value settings (/option=value works too):\n\n  {string.Join("\n  ", options.Select(o => o.UsageText()))}"
                       + $"\n"
                       + $"\nUse the @optionsFile syntax to read more options from a file."
                       + $"\n"
@@ -196,6 +203,9 @@ private static void ValidateContext(Context context)
         {
             if (!File.Exists(context.ExcelPath))
                 throw new ExpectedException($"The /{nameof(context.ExcelPath)} argument is required.");
+
+            if (string.IsNullOrWhiteSpace(context.ColumnSeparator))
+                throw new ExpectedException($"The /{nameof(context.ColumnSeparator)} argument cannot be empty or blank.");
         }
 
         private static bool ResolvePositionalArgument(Context context, string arg)

TimeSeries/PublicApis/SdkExamples/ExcelCsvExtractor/Readme.md

@@ -81,6 +81,7 @@ Supported -option=value settings (/option=value works too):
   -ExcelPath         Specifies the Excel workbook to split
   -Sheets            Split out the named sheets. [default: All sheets]
   -OutputPath        Output path of CSVs (default: {ExcelPath}.{SheetName}.csv
+  -ColumnSeparator   Separator between columns [default: ,]
   -Overwrite         Set to true to overwrite existing files. [default: False]
   -TrimEmptyColumns  Set to false to retain empty columns at the end of each row. [default: True]
   -DateTimeFormat    Sets the format of any timestamps, using .NET datetime format [default: ISO8601]

TimeSeries/PublicApis/SdkExamples/ExcelCsvExtractor/Splitter.cs

@@ -129,7 +129,7 @@ private void ExtractCsv(DataTable table)
                         }
                     }
 
-                    writer.WriteLine(string.Join(", ", columns));
+                    writer.WriteLine(string.Join(Context.ColumnSeparator, columns));
                 }
             }
         }
@@ -138,10 +138,18 @@ private void ExtractCsv(DataTable table)
 
         private string FormatCell(object cell)
         {
+            if (cell == null)
+                return string.Empty;
+
             if (cell is DateTime dateTime)
                 return dateTime.ToString(Context.DateTimeFormat ?? "O");
 
-            return $"{cell}";
+            var text = cell.ToString();
+
+            if (Context.TrimEmptyColumns)
+                text = text.Trim();
+
+            return text;
         }
 
         private static string CsvEscapedColumn(string text)