Merge pull request #1711 from AllenNeuralDynamics/feat-settings-csv-parse

Feat settings csv parse

Author: micahwoodard

bonsai/Bonsai.config

@@ -50,6 +50,7 @@
     <Package id="Bonsai.VR" version="0.6.0" />
     <Package id="Bonsai.Windows.Input" version="2.7.0" />
     <Package id="BonVision" version="0.11.0" />
+    <Package id="CsvHelper" version="33.1.0" />
     <Package id="Harp.AnalogInput" version="0.2.0" />
     <Package id="Harp.Behavior" version="0.1.0" />
     <Package id="Harp.LoadCells" version="0.2.0" />
@@ -65,6 +66,9 @@
     <Package id="jacobslusser.ScintillaNET" version="3.6.3" />
     <Package id="Markdig" version="0.18.1" />
     <Package id="MathNet.Numerics" version="4.15.0" />
+    <Package id="Microsoft.Bcl.AsyncInterfaces" version="8.0.0" />
+    <Package id="Microsoft.Bcl.HashCode" version="1.1.1" />
+    <Package id="Microsoft.CSharp" version="4.7.0" />
     <Package id="Microsoft.Web.WebView2" version="1.0.1823.32" />
     <Package id="Newtonsoft.Json" version="13.0.3" />
     <Package id="openal.redist" version="2.0.7" />
@@ -82,6 +86,7 @@
     <Package id="System.Memory" version="4.6.0" />
     <Package id="System.Numerics.Vectors" version="4.6.0" />
     <Package id="System.Runtime.CompilerServices.Unsafe" version="6.1.0" />
+    <Package id="System.Threading.Tasks.Extensions" version="4.5.4" />
     <Package id="YamlDotNet" version="16.3.0" />
     <Package id="ZedGraph" version="5.1.7" />
   </Packages>
@@ -187,6 +192,7 @@
     <AssemblyLocation assemblyName="Bonsai.VR" processorArchitecture="MSIL" location="Packages\Bonsai.VR.0.6.0\lib\net45\Bonsai.VR.dll" />
     <AssemblyLocation assemblyName="Bonsai.Windows.Input" processorArchitecture="MSIL" location="Packages\Bonsai.Windows.Input.2.7.0\lib\net462\Bonsai.Windows.Input.dll" />
     <AssemblyLocation assemblyName="BonVision" processorArchitecture="MSIL" location="Packages\BonVision.0.11.0\lib\net462\BonVision.dll" />
+    <AssemblyLocation assemblyName="CsvHelper" processorArchitecture="MSIL" location="Packages\CsvHelper.33.1.0\lib\net48\CsvHelper.dll" />
     <AssemblyLocation assemblyName="Harp.AnalogInput" processorArchitecture="MSIL" location="Packages\Harp.AnalogInput.0.2.0\lib\net462\Harp.AnalogInput.dll" />
     <AssemblyLocation assemblyName="Harp.Behavior" processorArchitecture="MSIL" location="Packages\Harp.Behavior.0.1.0\lib\net462\Harp.Behavior.dll" />
     <AssemblyLocation assemblyName="Harp.LoadCells" processorArchitecture="MSIL" location="Packages\Harp.LoadCells.0.2.0\lib\net462\Harp.LoadCells.dll" />
@@ -203,6 +209,8 @@
     <AssemblyLocation assemblyName="IronPython.Wpf" processorArchitecture="MSIL" location="Packages\IronPython.2.7.5\lib\Net45\IronPython.Wpf.dll" />
     <AssemblyLocation assemblyName="Markdig" processorArchitecture="MSIL" location="Packages\Markdig.0.18.1\lib\net40\Markdig.dll" />
     <AssemblyLocation assemblyName="MathNet.Numerics" processorArchitecture="MSIL" location="Packages\MathNet.Numerics.4.15.0\lib\net461\MathNet.Numerics.dll" />
+    <AssemblyLocation assemblyName="Microsoft.Bcl.AsyncInterfaces" processorArchitecture="MSIL" location="Packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll" />
+    <AssemblyLocation assemblyName="Microsoft.Bcl.HashCode" processorArchitecture="MSIL" location="Packages\Microsoft.Bcl.HashCode.1.1.1\lib\net461\Microsoft.Bcl.HashCode.dll" />
     <AssemblyLocation assemblyName="Microsoft.Dynamic" processorArchitecture="MSIL" location="Packages\IronPython.2.7.5\lib\Net45\Microsoft.Dynamic.dll" />
     <AssemblyLocation assemblyName="Microsoft.Scripting" processorArchitecture="MSIL" location="Packages\IronPython.2.7.5\lib\Net45\Microsoft.Scripting.dll" />
     <AssemblyLocation assemblyName="Microsoft.Scripting.AspNet" processorArchitecture="MSIL" location="Packages\IronPython.2.7.5\lib\Net45\Microsoft.Scripting.AspNet.dll" />
@@ -231,6 +239,7 @@
     <AssemblyLocation assemblyName="System.Reactive.Linq" processorArchitecture="MSIL" location="Packages\Rx-Linq.2.2.5\lib\net45\System.Reactive.Linq.dll" />
     <AssemblyLocation assemblyName="System.Reactive.PlatformServices" processorArchitecture="MSIL" location="Packages\Rx-PlatformServices.2.2.5\lib\net45\System.Reactive.PlatformServices.dll" />
     <AssemblyLocation assemblyName="System.Runtime.CompilerServices.Unsafe" processorArchitecture="MSIL" location="Packages\System.Runtime.CompilerServices.Unsafe.6.1.0\lib\net462\System.Runtime.CompilerServices.Unsafe.dll" />
+    <AssemblyLocation assemblyName="System.Threading.Tasks.Extensions" processorArchitecture="MSIL" location="Packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll" />
     <AssemblyLocation assemblyName="YamlDotNet" processorArchitecture="MSIL" location="Packages\YamlDotNet.16.3.0\lib\net47\YamlDotNet.dll" />
     <AssemblyLocation assemblyName="ZedGraph" processorArchitecture="MSIL" location="Packages\ZedGraph.5.1.7\lib\net35-Client\ZedGraph.dll" />
   </AssemblyLocations>

src/foraging_gui/__init__.py

@@ -1,2 +1,2 @@
-__version__ = "1.6.62"
+__version__ = "1.6.65"
 

src/workflows/Extensions.csproj

@@ -10,6 +10,7 @@
     <PackageReference Include="Bonsai.Osc" Version="2.7.0" />
     <PackageReference Include="Bonsai.DAQmx" Version="0.2.1-alpha1" />
     <PackageReference Include="Bonsai.Vision.Design" Version="2.7.0" />
+    <PackageReference Include="CsvHelper" Version="27.2.1" />
   </ItemGroup>
 
 </Project>

src/workflows/Extensions/ParseSettingCsv.cs

@@ -4,32 +4,34 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reactive.Linq;
+using System.IO;
+using CsvHelper;
+using System.Globalization;
 
 [Combinator]
-[Description("Parses lines, splitting at the first comma.")]
+[Description("Parses CSV synchronously.")]
 [WorkflowElementCategory(ElementCategory.Transform)]
 public class ParseSettingCsv
 {
    public IObservable<Dictionary<string, string>> Process(IObservable<string> source)
     {
         return source.Select(value =>
         {
-            // split into lines
-            var lines = value.Split(new[] { "\r\n", "\n" }, StringSplitOptions.RemoveEmptyEntries);
-            
             var settings = new Dictionary<string, string>();
-            foreach (var line in lines)
+
+            using (var reader = new StringReader(value))
+            using (var csv = new CsvReader(reader, CultureInfo.InvariantCulture))
             {
-                int commaIndex = line.IndexOf(',');
-                if (commaIndex >= 0)    // skip if no comma in line
+                while (csv.Read())
                 {
-                    string key = line.Substring(0, commaIndex);
-                    string val = line.Substring(commaIndex + 1);
+                    var key = csv.GetField(0);
+                    var val = csv.GetField(1);
                     settings[key] = val;
                 }
             }
 
             return settings;
+
         });
     }
 }