Version 4.5.0

[nikiroo-utils.git] / src / be / nikiroo / utils / serial / Importer.java

diff --git a/src/be/nikiroo/utils/serial/Importer.java b/src/be/nikiroo/utils/serial/Importer.java
index d21f1dd341c9085af11a08015a05c5fb04fc5c14..84fb5aae5742f49bcf68cd915906a2b7322a399b 100644 (file)
--- a/src/be/nikiroo/utils/serial/Importer.java
+++ b/src/be/nikiroo/utils/serial/Importer.java
@@ -26,6 +26,9 @@ public class Importer {
 
        private String currentFieldName;
 
+       /**
+        * Create a new {@link Importer}.
+        */
        public Importer() {
                map = new HashMap<String, Object>();
                map.put("NULL", null);
@@ -53,27 +56,42 @@ public class Importer {
         *             because it is not compatible with this code
         * @throws ClassNotFoundException
         *             if a class described in the serialised data cannot be found
+        * @throws IOException
+        *             if the content cannot be read (for instance, corrupt data)
         */
        public Importer read(String data) throws NoSuchFieldException,
-                       NoSuchMethodException, ClassNotFoundException {
+                       NoSuchMethodException, ClassNotFoundException, IOException {
 
+               Scanner scan = new Scanner(data);
                try {
-                       Scanner scan = new Scanner(data);
                        scan.useDelimiter("\n");
                        while (scan.hasNext()) {
                                String line = scan.next();
 
                                if (line.startsWith("ZIP:")) {
-                                       line = StringUtils.unzip64(line.substring("ZIP:".length()));
+                                       try {
+                                               line = StringUtils.unbase64s(
+                                                               line.substring("ZIP:".length()), true);
+                                       } catch (IOException e) {
+                                               throw new IOException(
+                                                               "Internal error when decoding ZIP content: input may be corrupt");
+                                       }
+                                       read(line);
+                               } else if (line.startsWith("B64:")) {
+                                       try {
+                                               line = StringUtils.unbase64s(
+                                                               line.substring("B64:".length()), false);
+                                       } catch (IOException e) {
+                                               throw new IOException(
+                                                               "Internal error when decoding B64 content: input may be corrupt");
+                                       }
                                        read(line);
                                } else {
                                        processLine(line);
                                }
                        }
+               } finally {
                        scan.close();
-               } catch (IOException e) {
-                       throw new NoSuchMethodException(
-                                       "Internal error when decoding ZIP content: input may be corrupt");
                }
 
                return this;
@@ -96,9 +114,11 @@ public class Importer {
         *             because it is not compatible with this code
         * @throws ClassNotFoundException
         *             if a class described in the serialised data cannot be found
+        * @throws IOException
+        *             if the content cannot be read (for instance, corrupt data)
         */
        private boolean processLine(String line) throws NoSuchFieldException,
-                       NoSuchMethodException, ClassNotFoundException {
+                       NoSuchMethodException, ClassNotFoundException, IOException {
                // Defer to latest child if any
                if (child != null) {
                        if (child.processLine(line)) {
@@ -143,7 +163,8 @@ public class Importer {
                        if (line.endsWith(":")) {
                                // field value is compound
                                currentFieldName = line.substring(0, line.length() - 1);
-                       } else if (line.startsWith(":") || !line.contains(":")) {
+                       } else if (line.startsWith(":") || !line.contains(":")
+                                       || line.startsWith("\"") || CustomSerializer.isCustom(line)) {
                                // not a field value but a direct value
                                me = SerialUtils.decode(line);
                        } else {