Changeset 12467 for branches/HiveStatistics/sources/HeuristicLab.Persistence/3.3/Default/Xml/XmlParser.cs

Timestamp:

06/18/15 11:56:31 (9 years ago)

Author:

dglaser

Message:

#2388: Merged trunk into HiveStatistics branch

Location:

branches/HiveStatistics/sources

Files:

• . (modified) (2 props)
• HeuristicLab.Persistence (modified) (1 prop)
• HeuristicLab.Persistence/3.3/Default/Xml/XmlParser.cs (modified) (2 diffs)

branches/HiveStatistics/sources/HeuristicLab.Persistence/3.3/Default/Xml/XmlParser.cs

@@ -218 +218 @@
 
     /// <summary>
-    /// Deserializes an object from the specified stream.
+    /// Deserializes an object from the specified stream using GZip compression.
     /// </summary>
     /// <param name="stream">The stream.</param>
     /// <returns>A fresh object instance.</returns>
-    public static object Deserialize(Stream stream) {
+    private static object DeserializeWithGZip(Stream stream) {
       try {
         using (StreamReader reader = new StreamReader(new GZipStream(stream, CompressionMode.Decompress))) {
@@ -239 +239 @@
 
     /// <summary>
+    /// Deserializes an object from the specified stream using Zip compression.
+    /// </summary>
+    /// <param name="stream">The stream.</param>
+    /// <returns>A fresh object instance.</returns>
+    private static object DeserializeWithZip(Stream stream) {
+      ZipArchive zipFile = new ZipArchive(stream);
+      return Deserialize(zipFile);
+    }
+
+    /// <summary>
     /// Deserializes an object from the specified stream.
     /// </summary>
     /// <typeparam name="T">object type expected from the serialized stream</typeparam>
     /// <param name="stream">The stream.</param>
+    /// <param name="useZip">If true, uses zip for decompression, otherwise gzip.</param>
     /// <returns>A fresh object instance.</returns>
-    public static T Deserialize<T>(Stream stream) {
-      return (T)Deserialize(stream);
+    public static T Deserialize<T>(Stream stream, bool useZip = false) {
+      return (T)Deserialize(stream, useZip);
+    }
+
+    /// <summary>
+    /// Deserializes an object from the specified stream.
+    /// </summary>
+    /// <param name="stream">The stream.</param>
+    /// <param name="useZip">If true, uses zip for decompression, otherwise gzip.</param>
+    /// <returns>A fresh object instance.</returns>
+    public static object Deserialize(Stream stream, bool useZip = false) {
+      if (useZip) {
+        return DeserializeWithZip(stream);
+      } else {
+        return DeserializeWithGZip(stream);
+      }
     }