Changeset 16480 for branches/2520_PersistenceReintegration/HeuristicLab.Core

Timestamp:

01/02/19 16:07:07 (5 years ago)

Author:

gkronber

Message:

#2520: use new persistence in ContentManager (with fallback), ClipBoard (with fallback), as well as for deep-cloning in Scripting and for Hive Persistence (without fallback & incomplete)

File:

• branches/2520_PersistenceReintegration/HeuristicLab.Core/3.3/PersistenceContentManager.cs (modified) (1 diff)

branches/2520_PersistenceReintegration/HeuristicLab.Core/3.3/PersistenceContentManager.cs

@@ -32 +32 @@
 
     protected override IStorableContent LoadContent(string filename) {
-      return XmlParser.Deserialize<IStorableContent>(filename);
+      // first try to load using the new persistence format
+      try {
+        var ser = new ProtoBufSerializer();
+        return (IStorableContent)ser.Deserialize(filename);
+      } catch (PersistenceException e) {
+        // try old format if new format fails
+        return XmlParser.Deserialize<IStorableContent>(filename);
+      }
     }
 
     protected override void SaveContent(IStorableContent content, string filename, bool compressed, CancellationToken cancellationToken) {
-      XmlGenerator.Serialize(content, filename, compressed ? CompressionLevel.Optimal : CompressionLevel.NoCompression, cancellationToken);
+      // XmlGenerator.Serialize(content, filename, compressed ? CompressionLevel.Optimal : CompressionLevel.NoCompression, cancellationToken);
+      // store files with the new persistence format
+      var ser = new ProtoBufSerializer();
+      ser.Serialize(content, filename); // TODO: support cancellation
     }
   }