Changeset 16945 for trunk

Timestamp:

05/11/19 14:38:47 (6 years ago)

Author:

jkarder

Message:

#2520: changed deserialization in PersistenceContentManager

• added method to check if old persistence can open a file
• used this method to determine which persistence to use

Location:

trunk

Files:

• HeuristicLab.Core/3.3/PersistenceContentManager.cs (modified) (1 diff)
• HeuristicLab.Persistence/3.3/Default/Xml/XmlParser.cs (modified) (1 diff)

trunk/HeuristicLab.Core/3.3/PersistenceContentManager.cs

@@ -31 +31 @@
 
     protected override IStorableContent LoadContent(string filename) {
-      // first try to load using the new persistence format
+      bool useOldPersistence = XmlParser.CanOpen(filename);
+      if (useOldPersistence) return XmlParser.Deserialize<IStorableContent>(filename);
+
       var ser = new ProtoBufSerializer();
-      try {
-        return (IStorableContent)ser.Deserialize(filename, out SerializationInfo info);
-      } catch (Exception e) {
-        try {
-          // try old format if new format fails
-          return XmlParser.Deserialize<IStorableContent>(filename);
-        } catch (Exception e2) {
-          throw new AggregateException($"Cannot open file {filename}", e, e2);
-        }
-      }
+      return (IStorableContent)ser.Deserialize(filename, out SerializationInfo info);
     }
 

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

@@ -288 +288 @@
       }
     }
+
+    /// <summary>
+    /// Checks if the given file can be opened as <see cref="ZipArchive" />.
+    /// </summary>
+    /// <param name="filename">The filename.</param>
+    /// <returns><see langword="true" /> if the file can be opened as <see cref="ZipArchive" />; otherwise, <see langword="false" />.</returns>
+    public static bool CanOpen(string filename) {
+      try {
+        using (FileStream fs = new FileStream(filename, FileMode.Open, FileAccess.Read)) {
+          using (ZipArchive zip = new ZipArchive(fs)) {
+            return true;
+          }
+        }
+      } catch (InvalidDataException) {
+        return false;
+      }
+    }
   }
 }