Enable SVGZ

SajjadToomari · Sep 2, 2019 · 2ce07a3 · 2ce07a3
1 parent 892c23b
commit 2ce07a3
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 2 deletions.
diff --git a/SvgConverter/ConverterLogic.cs b/SvgConverter/ConverterLogic.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
+using System.IO.Compression;
 using System.Linq;
 using System.Text.RegularExpressions;
 using System.Threading;
@@ -359,8 +360,14 @@ internal static DrawingGroup SvgFileToWpfObject(string filepath, WpfDrawingSetti
  // }
  //}
 
+ filepath = Path.GetFullPath(filepath);
+ Stream stream = IsSvgz(filepath)
+ ? (Stream)new GZipStream(File.OpenRead(filepath), CompressionMode.Decompress, false)
+ : File.OpenRead(filepath);
+ var doc = XDocument.Load(stream);
+ stream.Dispose();
+
  //workaround: error when Id starts with a number
- var doc = XDocument.Load(Path.GetFullPath(filepath));
  FixIds(doc.Root); //id="3d-view-icon" -> id="_3d-view-icon"
  using (var ms = new MemoryStream())
  {
@@ -371,6 +378,11 @@ internal static DrawingGroup SvgFileToWpfObject(string filepath, WpfDrawingSetti
  }
  }
 
+ private static bool IsSvgz(string filepath)
+ {
+ return string.Equals(Path.GetExtension(filepath), ".svgz", StringComparison.OrdinalIgnoreCase);
+ }
+
  private static void FixIds(XElement root)
  {
  var idAttributesStartingWithDigit = root.DescendantsAndSelf()

diff --git a/SvgConverterTest/SvgConverterTest.csproj b/SvgConverterTest/SvgConverterTest.csproj
@@ -97,6 +97,7 @@
  <Compile Include="FileUtilsTests.cs" />
  <Compile Include="Properties\AssemblyInfo.cs" />
  <Compile Include="ConverterTests.cs" />
+ <Compile Include="SvgzTest.cs" />
  <Compile Include="T4Methods.cs" />
  </ItemGroup>
  <ItemGroup>
@@ -139,6 +140,9 @@
  </Content>
  </ItemGroup>
  <ItemGroup>
+ <None Include="TestFiles\example.svgz">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
  <None Include="TestFiles\xamlUntidy.xaml">
  <SubType>Designer</SubType>
  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

diff --git a/SvgConverterTest/SvgzTest.cs b/SvgConverterTest/SvgzTest.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.IO.Compression;
+using System.Linq;
+using System.Net;
+using System.Text;
+using System.Threading.Tasks;
+using NUnit.Framework;
+
+namespace SvgConverterTest
+{
+ public class SvgzTest
+ {
+ [Test]
+ public void TestUnzip()
+ {
+ var fs = File.OpenRead(@".\TestFiles\example.svgz");
+ var stream = new System.IO.Compression.GZipStream(fs, CompressionMode.Decompress);
+ var destination = File.OpenWrite(@".\TestFiles\example.svg");
+ stream.CopyTo(destination);
+
+ }
+ }
+}
diff --git a/SvgConverterTest/TestFiles/Images.html b/SvgConverterTest/TestFiles/Images.html
@@ -3,5 +3,5 @@
  <head>
  <title>Browse svg images</title>
  </head>
- <body>Images in file: ..\..\TestFiles\images<br /><img src="3d-view-icon.svg" title="3d-view-icon" height="128" width="128" /><img src="cloud-3-icon.svg" title="cloud-3-icon" height="128" width="128" /><img src="Handwheel.svg" title="Handwheel" height="128" width="128" /><img src="JOG.svg" title="JOG" height="128" width="128" /></body>
+ <body>Images in file: ..\..\TestFiles\images<br /><img src="3d-view-icon.svg" title="3d-view-icon" height="128" width="128" /><img src="cloud-3-icon.svg" title="cloud-3-icon" height="128" width="128" /><img src="example.svg" title="example" height="128" width="128" /><img src="example.svgz" title="example" height="128" width="128" /><img src="Handwheel.svg" title="Handwheel" height="128" width="128" /><img src="JOG.svg" title="JOG" height="128" width="128" /></body>
 </html>
diff --git a/SvgConverterTest/TestFiles/example.svgz b/SvgConverterTest/TestFiles/example.svgz