initial support for zlib encoded blobs

yole · May 9, 2007 · 390cd9a · 390cd9a
1 parent e359086
commit 390cd9a
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 1 deletion.
diff --git a/References/ICSharpCode.SharpZipLib.dll b/References/ICSharpCode.SharpZipLib.dll
diff --git a/Structorian.Engine.Tests/LoadDataTest.cs b/Structorian.Engine.Tests/LoadDataTest.cs
@@ -3,6 +3,8 @@
 using System.Diagnostics;
 using System.IO;
 using System.Text;
+using ICSharpCode.SharpZipLib.Core;
+using ICSharpCode.SharpZipLib.Zip.Compression.Streams;
 using NUnit.Framework;
 using Structorian.Engine.Fields;
 
@@ -896,5 +898,21 @@ [Test] public void NegativeStrLen()
             Assert.AreEqual(1, instance.Cells.Count);
             Assert.IsTrue(instance.Cells [0].IsError());
         }
+
+        [Test] public void ZipBlob()
+        {
+            MemoryStream sourceStream = new MemoryStream(new byte[] { 12, 34, 56, 78 });
+            MemoryStream compressedStream = new MemoryStream();
+            DeflaterOutputStream deflaterStream = new DeflaterOutputStream(compressedStream);
+            StreamUtils.Copy(sourceStream, deflaterStream, new byte[4096]);
+            deflaterStream.Finish();
+            Assert.AreEqual(12, compressedStream.Length);
+            compressedStream.Capacity = (int) compressedStream.Length;
+            StructInstance instance = PrepareInstance(
+                "struct A { blob q [len=FileSize, encoding=zlib]; }",
+                compressedStream.GetBuffer());
+            BlobCell cell = (BlobCell) instance.Cells[0];
+            Assert.AreEqual(4, cell.DataStream.Length);
+        }
     }
 }
diff --git a/Structorian.Engine.Tests/Structorian.Engine.Tests.csproj b/Structorian.Engine.Tests/Structorian.Engine.Tests.csproj
@@ -28,6 +28,10 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="ICSharpCode.SharpZipLib, Version=0.85.1.271, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\References\ICSharpCode.SharpZipLib.dll</HintPath>
+    </Reference>
     <Reference Include="nunit.framework, Version=2.2.8.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\References\nunit.framework.dll</HintPath>

diff --git a/Structorian.Engine/AttributeRegistry.cs b/Structorian.Engine/AttributeRegistry.cs
@@ -16,6 +16,7 @@ internal AttributeRegistry()
             RegisterAttribute(typeof(AssertField), "expr", AttributeType.Expression);
             RegisterAttribute(typeof(BitfieldField), "size", AttributeType.Expression);
             RegisterAttribute(typeof(BlobField), "len", AttributeType.Expression);
+            RegisterAttribute(typeof(BlobField), "encoding", AttributeType.String);
             RegisterAttribute(typeof(CalcField), "value", AttributeType.Expression);
             RegisterAttribute(typeof(CaseField), "expr", AttributeType.Expression);
             RegisterAttribute(typeof(CaseField), "default", AttributeType.Bool);

diff --git a/Structorian.Engine/Fields/BlobCell.cs b/Structorian.Engine/Fields/BlobCell.cs
@@ -26,7 +26,7 @@ public BlobCell(StructField def, byte[] data, int offset) : base(def, null, offs
 
         public Stream DataStream
         {
-            get { return _dataStream; }
+            get { return _dataStream;  }
         }
     }
 }
diff --git a/Structorian.Engine/Fields/BlobField.cs b/Structorian.Engine/Fields/BlobField.cs
@@ -1,6 +1,8 @@
 using System;
 using System.IO;
 using System.Text;
+using ICSharpCode.SharpZipLib.Zip.Compression;
+using ICSharpCode.SharpZipLib.Zip.Compression.Streams;
 
 namespace Structorian.Engine.Fields
 {
@@ -17,6 +19,20 @@ public override void LoadData(BinaryReader reader, StructInstance instance)
             if (offset + len > reader.BaseStream.Length)
                 throw new LoadDataException("Blob size " + len + " exceeds stream length");
             byte[] blobBytes = reader.ReadBytes(len);
+            string encoding = GetStringAttribute("encoding");
+            if (encoding == "zlib")
+            {
+                InflaterInputStream stream = new InflaterInputStream(new MemoryStream(blobBytes));
+                byte[] data = new byte[4096];
+                MemoryStream outStream = new MemoryStream();
+                int size;
+                while((size = stream.Read(data, 0, data.Length)) > 0)
+                {
+                    outStream.Write(data, 0, size);
+                }
+                outStream.Capacity = (int) outStream.Length;
+                blobBytes = outStream.GetBuffer();
+            }
             BlobCell cell = new BlobCell(this, blobBytes, offset);
             instance.AddCell(cell, _hidden);
             instance.RegisterCellSize(cell, len);

diff --git a/Structorian.Engine/Structorian.Engine.csproj b/Structorian.Engine/Structorian.Engine.csproj
@@ -28,6 +28,10 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="ICSharpCode.SharpZipLib, Version=0.85.1.271, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\References\ICSharpCode.SharpZipLib.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />