Merge pull request #31 from avmaisak/dev

Fixed PrusaSlicer Parser
avmaisak · Feb 13, 2020 · 10a1623 · 10a1623
2 parents 7363a06 + 95ca666
commit 10a1623
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 18 deletions.
diff --git a/src/Gcode.Utils/Gcode.Utils.csproj b/src/Gcode.Utils/Gcode.Utils.csproj
@@ -13,10 +13,10 @@
     <PackageTags>gcode 3d-printing reprap reprap-3d-printer marlin marlin-firmware repitier repitier-firmware json json-parsing gcode-json cura kisslicer slic3r simplify3d</PackageTags>
     <RepositoryType>git</RepositoryType>
     <Copyright>Anton Maisak</Copyright>
-    <AssemblyVersion>0.2.0.13</AssemblyVersion>
+    <AssemblyVersion>0.2.0.14</AssemblyVersion>
     <PackageReleaseNotes></PackageReleaseNotes>
-    <Version>0.2.13</Version>
-    <FileVersion>0.2.0.13</FileVersion>
+    <Version>0.2.14</Version>
+    <FileVersion>0.2.0.14</FileVersion>
     <PackageIconUrl>https://raw.githubusercontent.com/avmaisak/Gcode/master/misc/design/logo/logo.png</PackageIconUrl>
   </PropertyGroup>
 

diff --git a/src/Gcode.Utils/SlicerParser/PrusaSlicerParser.cs b/src/Gcode.Utils/SlicerParser/PrusaSlicerParser.cs
@@ -23,14 +23,13 @@ public override Slic3RInfo GetSlicerInfo(string[] fileContent)
 			var filamentUsed = fileContent.Where(x => x.StartsWith("; filament used [mm] = ")).ToArray();
 			if (filamentUsed.Length == 1 && filamentUsed[0] != null)
 			{
-				// filament used
-				res.FilamentUsedExtruder1 = Convert.ToDecimal(filamentUsed[0].Split('=')[1]?.Split(' ')[1]?.Replace("[mm]", "").Replace(".", ","));
+				res.FilamentUsedExtruder1 = Convert.ToDecimal(filamentUsed[0].Split('=')[1].Split(',')[0].Trim().Replace(".",","));
 			}
 
 			if (filamentUsed.Length == 2 && filamentUsed[1] != null)
 			{
 				// filament used
-				res.FilamentUsedExtruder2 = Convert.ToDecimal(filamentUsed[1].Split('=')[1]?.Split(' ')[1]?.Replace("[mm]", "").Replace(".", ","));
+				res.FilamentUsedExtruder2 = Convert.ToDecimal(filamentUsed[1].Split('=')[1]?.Split('=')[1].Split(','));
 			}
 
 			var filamentDiameter = fileContent.FirstOrDefault(x => x.StartsWith("; filament_diameter"));

diff --git a/tools/TestSuite/Gcode.Test/Gcode.Test.csproj b/tools/TestSuite/Gcode.Test/Gcode.Test.csproj
@@ -14,9 +14,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0-preview-20200102-01" />
-    <PackageReference Include="MSTest.TestAdapter" Version="2.1.0-beta2" />
-    <PackageReference Include="MSTest.TestFramework" Version="2.1.0-beta2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="2.1.0" />
+    <PackageReference Include="MSTest.TestFramework" Version="2.1.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/tools/TestSuite/Gcode.Test/Infrastructure/TestSuiteDataSource.cs b/tools/TestSuite/Gcode.Test/Infrastructure/TestSuiteDataSource.cs
@@ -1,6 +1,7 @@
 using System.IO;
 
-namespace Gcode.Test.Infrastructure {
+namespace Gcode.Test.Infrastructure
+{
 	public static class TestSuiteDataSource
 	{
 		private static readonly string InternalTestFolder = $@"{Directory.GetCurrentDirectory()}\..\..\..\..\..\TestData\";
@@ -15,15 +16,11 @@ public static class TestSuiteDataSource
 			"G1 X553.44 Y251.064 E0.01052 F2196",
 			"M115"
 		};
-
-		public static string GetDataSource(string fileName)
-		{
-			return File.ReadAllText($@"{InternalTestFolder}{fileName}");
-		}
-
-		public static string[] GetDataSourceArray(string fileName)
+		public static string GetDataSource(string fileName) => File.ReadAllText($@"{InternalTestFolder}{fileName}");
+		public static string[] GetDataSourceArray(string fileName, bool external = false)
 		{
-			return File.ReadAllLines($"{InternalTestFolder}{fileName}");
+			if (!external) return File.ReadAllLines($"{InternalTestFolder}{fileName}");
+			return File.ReadAllLines(fileName);
 		}
 	}
 }