Ticket #2247: persistence.patch

HeuristicLab.Core.Views/3.3/Clipboard.cs

@@ -23 +23 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.IO;
+using System.IO.Compression;
 using System.Linq;
 using System.Threading;
 using System.Windows.Forms;
@@ -197 +198 @@
         try {
           i++;
           SetEnabledStateOfContentViews(item, false);
-          XmlGenerator.Serialize(item, ItemsPath + Path.DirectorySeparatorChar + i.ToString("00000000") + ".hl", 9);
+          XmlGenerator.Serialize(item, ItemsPath + Path.DirectorySeparatorChar + i.ToString("00000000") + ".hl", CompressionLevel.Optimal);
           OnItemSaved(item, progressBar.Maximum / listView.Items.Count);
         }
         catch (Exception) { }

HeuristicLab.Core/3.3/PersistenceContentManager.cs

@@ -19 +19 @@
  */
 #endregion
 
+using System.IO.Compression;
 using HeuristicLab.Common;
 using HeuristicLab.Persistence.Default.Xml;
 
@@ -31 +32 @@
     }
 
     protected override void SaveContent(IStorableContent content, string filename, bool compressed) {
-      XmlGenerator.Serialize(content, filename, compressed ? 9 : 0);
+      XmlGenerator.Serialize(content, filename, compressed ? CompressionLevel.Optimal : CompressionLevel.NoCompression);
     }
   }
 }

HeuristicLab.Persistence/3.3/Default/Xml/XmlGenerator.cs

@@ -29 +29 @@
 using HeuristicLab.Persistence.Core.Tokens;
 using HeuristicLab.Persistence.Interfaces;
 using HeuristicLab.Tracing;
-using ICSharpCode.SharpZipLib.Zip;
 
 namespace HeuristicLab.Persistence.Default.Xml {
 
@@ -285 +284 @@
     /// <param name="o">The object.</param>
     /// <param name="filename">The filename.</param>
     public static void Serialize(object o, string filename) {
-      Serialize(o, filename, ConfigurationService.Instance.GetConfiguration(new XmlFormat()), false, 5);
+      Serialize(o, filename, ConfigurationService.Instance.GetConfiguration(new XmlFormat()), false, CompressionLevel.Optimal);
     }
 
     /// <summary>
@@ -296 +295 @@
     /// <param name="o">The object.</param>
     /// <param name="filename">The filename.</param>
     /// <param name="compression">ZIP file compression level</param>
-    public static void Serialize(object o, string filename, int compression) {
+    public static void Serialize(object o, string filename, CompressionLevel compression) {
       Serialize(o, filename, ConfigurationService.Instance.GetConfiguration(new XmlFormat()), false, compression);
     }
 
@@ -308 +307 @@
     /// <param name="filename">The filename.</param>
     /// <param name="config">The configuration.</param>
     public static void Serialize(object obj, string filename, Configuration config) {
-      Serialize(obj, filename, config, false, 5);
+      Serialize(obj, filename, config, false, CompressionLevel.Optimal);
     }
 
     /// <summary>
@@ -319 +318 @@
     /// <param name="config">The configuration.</param>
     /// <param name="includeAssemblies">if set to <c>true</c> include needed assemblies.</param>
     /// <param name="compression">The ZIP compression level.</param>
-    public static void Serialize(object obj, string filename, Configuration config, bool includeAssemblies, int compression) {
+    public static void Serialize(object obj, string filename, Configuration config, bool includeAssemblies, CompressionLevel compression) {
       try {
         string tempfile = Path.GetTempFileName();
         DateTime start = DateTime.Now;
@@ -327 +326 @@
           Serializer serializer = new Serializer(obj, config);
           serializer.InterleaveTypeInformation = false;
           XmlGenerator generator = new XmlGenerator();
-          using (ZipOutputStream zipStream = new ZipOutputStream(stream)) {
-            zipStream.IsStreamOwner = false;
-            zipStream.SetLevel(compression);
-            zipStream.PutNextEntry(new ZipEntry("data.xml") { DateTime = DateTime.MinValue });
-            StreamWriter writer = new StreamWriter(zipStream);
-            foreach (ISerializationToken token in serializer) {
-              string line = generator.Format(token);
-              writer.Write(line);
+          using (ZipArchive zipArchive = new ZipArchive(stream, ZipArchiveMode.Create)) {
+            ZipArchiveEntry entry = zipArchive.CreateEntry("data.xml", compression);
+            using (StreamWriter writer = new StreamWriter(entry.Open())) {
+              foreach (ISerializationToken token in serializer) {
+                string line = generator.Format(token);
+                writer.Write(line);
+              }
             }
-            writer.Flush();
-            zipStream.PutNextEntry(new ZipEntry("typecache.xml") { DateTime = DateTime.MinValue });
-            foreach (string line in generator.Format(serializer.TypeCache)) {
-              writer.Write(line);
+            entry = zipArchive.CreateEntry("typecache.xml", compression);
+            using (StreamWriter writer = new StreamWriter(entry.Open())) {
+              foreach (string line in generator.Format(serializer.TypeCache)) {
+                writer.Write(line);
+              }
             }
-            writer.Flush();
             if (includeAssemblies) {
               foreach (string name in serializer.RequiredFiles) {
                 Uri uri = new Uri(name);
@@ -349 +347 @@
                   Logger.Warn("cannot read non-local files");
                   continue;
                 }
-                zipStream.PutNextEntry(new ZipEntry(Path.GetFileName(uri.PathAndQuery)));
-                FileStream reader = File.OpenRead(uri.PathAndQuery);
-                byte[] buffer = new byte[1024 * 1024];
-                while (true) {
-                  int bytesRead = reader.Read(buffer, 0, 1024 * 1024);
-                  if (bytesRead == 0)
-                    break;
-                  zipStream.Write(buffer, 0, bytesRead);
+                entry = zipArchive.CreateEntry(Path.GetFileName(uri.PathAndQuery), compression);
+                using (BinaryWriter bw = new BinaryWriter(entry.Open())) {
+                  using (FileStream reader = File.OpenRead(uri.PathAndQuery)) {
+                    byte[] buffer = new byte[1024 * 1024];
+                    while (true) {
+                      int bytesRead = reader.Read(buffer, 0, 1024 * 1024);
+                      if (bytesRead == 0)
+                        break;
+                      bw.Write(buffer, 0, bytesRead);
+                    }
+                  }
                 }
-                writer.Flush();
               }
             }
           }
@@ -406 +406 @@
       try {
         Serializer serializer = new Serializer(obj, config);
         Serialize(stream, serializer);
-      } catch (PersistenceException) {
+      }
+      catch (PersistenceException) {
         throw;
-      } catch (Exception e) {
+      }
+      catch (Exception e) {
         throw new PersistenceException("Unexpected exception during Serialization.", e);
       }
     }
@@ -426 +428 @@
         Serializer serializer = new Serializer(obj, config);
         Serialize(stream, serializer);
         types = serializer.SerializedTypes;
-      } catch (PersistenceException) {
+      }
+      catch (PersistenceException) {
         throw;
-      } catch (Exception e) {
+      }
+      catch (Exception e) {
         throw new PersistenceException("Unexpected exception during Serialization.", e);
       }
     }

HeuristicLab.Persistence/3.3/Default/Xml/XmlParser.cs

@@ -28 +28 @@
 using HeuristicLab.Persistence.Core;
 using HeuristicLab.Persistence.Core.Tokens;
 using HeuristicLab.Persistence.Interfaces;
-using ICSharpCode.SharpZipLib.Zip;
 
 namespace HeuristicLab.Persistence.Default.Xml {
 
@@ -192 +191 @@
     public static object Deserialize(string filename) {
       TimeSpan start = System.Diagnostics.Process.GetCurrentProcess().TotalProcessorTime;
       try {
-        using (ZipFile file = new ZipFile(filename)) {
-          return Deserialize(file);
+        using (FileStream fs = new FileStream(filename, FileMode.Open, FileAccess.Read)) {
+          using (ZipArchive zip = new ZipArchive(fs)) {
+            return Deserialize(zip);
+          }
         }
       }
       finally {
@@ -246 +247 @@
       return (T)Deserialize(stream);
     }
 
-    private static object Deserialize(ZipFile zipFile) {
+    private static object Deserialize(ZipArchive zipFile) {
       try {
-        ZipEntry typecache = zipFile.GetEntry("typecache.xml");
+        ZipArchiveEntry typecache = zipFile.GetEntry("typecache.xml");
         if (typecache == null)
           throw new PersistenceException("file does not contain typecache.xml");
-        Deserializer deSerializer = new Deserializer(ParseTypeCache(new StreamReader(zipFile.GetInputStream(typecache))));
-        ZipEntry data = zipFile.GetEntry("data.xml");
+        Deserializer deSerializer = new Deserializer(ParseTypeCache(new StreamReader(typecache.Open())));
+        ZipArchiveEntry data = zipFile.GetEntry("data.xml");
         if (data == null)
           throw new PersistenceException("file does not contain data.xml");
         XmlParser parser = new XmlParser(
-          new StreamReader(zipFile.GetInputStream(data)));
+          new StreamReader(data.Open()));
         object result = deSerializer.Deserialize(parser);
-        zipFile.Close();
+
         return result;
       }
       catch (PersistenceException) {

HeuristicLab.Persistence/3.3/HeuristicLab.Persistence-3.3.csproj

@@ -127 +127 @@
     </Reference>
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
+    <Reference Include="System.IO.Compression" />
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>