agate-svn-commit Mailing List for AgateLib (Page 15)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 1187
          http://agate.svn.sourceforge.net/agate/?rev=1187&view=rev
Author:   kanato
Date:     2010-01-24 22:16:52 +0000 (Sun, 24 Jan 2010)

Log Message:
-----------
Implement serialization of streams in XleSerializer.

Modified Paths:
--------------
    trunk/AgateLib/AgateLib.csproj
    trunk/AgateLib/Serialization/Xle/XleSerializationInfo.cs

Added Paths:
-----------
    trunk/AgateLib/Serialization/Xle/CompressionType.cs

Modified: trunk/AgateLib/AgateLib.csproj
===================================================================

--- trunk/AgateLib/AgateLib.csproj	2010-01-11 23:12:48 UTC (rev 1186)
+++ trunk/AgateLib/AgateLib.csproj	2010-01-24 22:16:52 UTC (rev 1187)
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
   <PropertyGroup>
     <ProjectType>Local</ProjectType>
-    <ProductVersion>9.0.30729</ProductVersion>
+    <ProductVersion>9.0.21022</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{9490B719-829E-43A7-A5FE-8001F8A81759}</ProjectGuid>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -197,6 +197,7 @@
     <Compile Include="DisplayLib\ImplementationBase\FrameBufferImpl.cs" />
     <Compile Include="Platform.cs" />
     <Compile Include="PlatformType.cs" />
+    <Compile Include="Serialization\Xle\CompressionType.cs" />
     <Compile Include="Settings\SettingsGroup.cs" />
     <Compile Include="Timing.cs">
       <SubType>Code</SubType>

Added: trunk/AgateLib/Serialization/Xle/CompressionType.cs
===================================================================
--- trunk/AgateLib/Serialization/Xle/CompressionType.cs	                        (rev 0)
+++ trunk/AgateLib/Serialization/Xle/CompressionType.cs	2010-01-24 22:16:52 UTC (rev 1187)
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace AgateLib.Serialization.Xle
+{
+	public enum CompressionType
+	{
+		None,
+		Deflate,
+		GZip,
+	}
+}

Modified: trunk/AgateLib/Serialization/Xle/XleSerializationInfo.cs
===================================================================
--- trunk/AgateLib/Serialization/Xle/XleSerializationInfo.cs	2010-01-11 23:12:48 UTC (rev 1186)
+++ trunk/AgateLib/Serialization/Xle/XleSerializationInfo.cs	2010-01-24 22:16:52 UTC (rev 1187)
@@ -18,6 +18,8 @@
 //
 using System;
 using System.Collections.Generic;
+using System.IO;
+using System.IO.Compression;
 using System.Text;
 using System.Xml;
 using System.Runtime.InteropServices;
@@ -342,13 +344,53 @@
 
 		}
 		/// <summary>
+		/// Writes a binary stream to the XML data as an element.  
+		/// Compresses the stream using GZip compression.
+		/// </summary>
+		/// <param name="name">The name of the XML element used.</param>
+		/// <param name="value">The stream of data to write.</param>
+		public void Write(string name, Stream value)
+		{
+			Write(name, value, CompressionType.GZip);
+		}
+		/// <summary>
+		/// Writes a binary stream to the XML data as an element.
+		/// </summary>
+		/// <param name="name">The name of the XML element used.</param>
+		/// <param name="value">The stream of data to write.</param>
+		/// <param name="compression">The compression algorithm to use.</param>
+		public void Write(string name, Stream value, CompressionType compression)
+		{
+			WriteImpl(name, value, compression);
+		}
+
+		private void WriteImpl(string name, Stream value, CompressionType compression)
+		{
+			MemoryStream ms = new MemoryStream();
+			Stream compressed = TranslateStream(ms, compression, CompressionMode.Compress);
+
+			byte[] uncompressedData = ReadFromStream(value);
+			compressed.Write(uncompressedData, 0, uncompressedData.Length);
+
+			byte[] buffer = ms.GetBuffer();
+
+			string newValue = Convert.ToBase64String(
+				buffer, Base64FormattingOptions.InsertLineBreaks);
+
+			XmlElement el = WriteAsElement(name, newValue);
+			AddAttribute(el, "stream", "true");
+			AddAttribute(el, "compression", compression.ToString());
+			AddAttribute(el, "encoding", "Base64");
+		}
+
+		/// <summary>
 		/// Writes a byte[] array to the XML data as an element.
 		/// </summary>
 		/// <param name="name">The name of the XML element used.</param>
 		/// <param name="value">The array data to write.</param>
 		public void Write(string name, byte[] value)
 		{
-			string newValue = Convert.ToBase64String(value, Base64FormattingOptions.None);
+			string newValue = Convert.ToBase64String(value, Base64FormattingOptions.InsertLineBreaks);
 
 			XmlElement el = WriteAsElement(name, newValue);
 			AddAttribute(el, "array", "true");
@@ -403,12 +445,17 @@
 				XmlElement item = doc.CreateElement("Item");
 				CurrentNode.AppendChild(item);
 
-				if (value[i].GetType() != listType)
-					AddAttribute(item, "type", value[i].GetType().ToString());
+				if (value[i] == null)
+					AddAttribute(item, "type", "null");
+				else
+				{
+					if (value[i].GetType() != listType)
+						AddAttribute(item, "type", value[i].GetType().ToString());
 
-				nodes.Push(item);
-				Serialize(value[i]);
-				nodes.Pop();
+					nodes.Push(item);
+					Serialize(value[i]);
+					nodes.Pop();
+				}
 			}
 
 			nodes.Pop();
@@ -742,7 +789,48 @@
 		{
 			return ReadStringImpl(name, false, string.Empty);
 		}
+		/// <summary>
+		/// Reads binary data stored as a stream.
+		/// </summary>
+		/// <param name="name"></param>
+		/// <returns></returns>
+		public Stream ReadStream(string name)
+		{
+			XmlElement element = (XmlElement)CurrentNode[name];
 
+			if (element == null)
+				throw new XleSerializationException("Field " + name + " was not found.");
+
+			if (element.Attributes["stream"] == null || element.Attributes["stream"].Value != "true")
+				throw new XleSerializationException("Field " + name + " is not a stream.");
+			if (element.Attributes["encoding"] == null)
+				throw new XleSerializationException("Field " + name + " does not have encoding information.");
+
+			string encoding = element.Attributes["encoding"].Value;
+			byte[] bytes;
+
+			if (encoding == "Base64")
+			{
+				bytes = Convert.FromBase64String(element.InnerText);
+			}
+			else
+				throw new XleSerializationException("Unrecognized encoding " + encoding);
+
+			CompressionType compression = CompressionType.None;
+
+			if (element.Attributes["compression"] != null)
+			{
+				compression = (CompressionType)
+					Enum.Parse(typeof(CompressionType), element.Attributes["compression"].Value, true);
+			}
+
+			MemoryStream ms = new MemoryStream(bytes);
+			ms.Position = 0;
+			Stream uncompressed = TranslateStream(ms, compression, CompressionMode.Decompress);
+
+			return uncompressed;
+		}
+
 		private string ReadStringImpl(string name, bool haveDefault, string defaultValue)
 		{
 			string attribute = CurrentNode.GetAttribute(name);
@@ -1006,7 +1094,7 @@
 				{
 					list.Add(item.InnerText);
 				}
-				else
+				else 
 				{
 					nodes.Push(item);
 
@@ -1078,8 +1166,52 @@
 
 		#endregion
 
+		#region --- Dealing with streams ---
 
 
+		/// <summary>
+		/// Reads data from a stream until the end is reached. The
+		/// data is returned as a byte array. An IOException is
+		/// thrown if any of the underlying IO calls fail.
+		/// </summary>
+		/// <param name="stream">The stream to read data from</param>
+		static byte[] ReadFromStream(Stream stream)
+		{
+			// Code is from
+			// http://www.yoda.arachsys.com/csharp/readbinary.html
+			byte[] buffer = new byte[32768];
+			using (MemoryStream ms = new MemoryStream())
+			{
+				while (true)
+				{
+					int read = stream.Read(buffer, 0, buffer.Length);
+					if (read <= 0)
+						return ms.ToArray();
+					ms.Write(buffer, 0, read);
+				}
+			}
+		}
+
+
+		private Stream TranslateStream(Stream value, CompressionType compression, CompressionMode mode)
+		{
+			switch (compression)
+			{
+				case CompressionType.None:
+					return value;
+				case CompressionType.Deflate:
+					return new DeflateStream(value, mode, true);
+				case CompressionType.GZip:
+					return new GZipStream(value, mode, true);
+
+				default:
+					throw new ArgumentException("Did not understand compression type.", "compression");
+			}
+		}
+
+		#endregion
+
+
 		internal object BeginDeserialize()
 		{
 			XmlElement root = (XmlElement)doc.ChildNodes[0];
@@ -1113,6 +1245,9 @@
 				// load the type if it is not the default type.
 				string typename = CurrentNode.Attributes["type"].Value;
 
+				if (typename == "null")
+					return null;
+
 				type = Binder.GetType(typename);
 
 				if (type == null)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




2009	Jan	Feb	Mar	Apr (86)	May (77)	Jun	Jul (1)	Aug (31)	Sep (12)	Oct (31)	Nov (53)	Dec (39)
2010	Jan (53)	Feb (14)	Mar	Apr	May	Jun	Jul	Aug (2)	Sep	Oct	Nov (7)	Dec (13)
2011	Jan (17)	Feb (5)	Mar (1)	Apr	May	Jun (1)	Jul	Aug	Sep	Oct (10)	Nov (21)	Dec
2012	Jan (6)	Feb (14)	Mar (5)	Apr (4)	May (1)	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2013	Jan (1)	Feb (8)	Mar (1)	Apr	May	Jun	Jul	Aug (2)	Sep (1)	Oct (5)	Nov (9)	Dec (5)
2014	Jan (3)	Feb (2)	Mar (4)	Apr (3)	May	Jun (5)	Jul (33)	Aug (69)	Sep (35)	Oct (4)	Nov (1)	Dec

agate-svn-commit Mailing List for AgateLib (Page 15)

agate-svn-commit — List with automated subversion commit messages.