fix Base64 but breaks compat

[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 a159ddedf4763859aefe8fc51ac82479d567ce0f..80a8684bd92f97433faf9d6ece457e0b41fa29be 100644 (file)
--- a/src/be/nikiroo/utils/serial/Importer.java
+++ b/src/be/nikiroo/utils/serial/Importer.java
@@ -1,12 +1,16 @@
 package be.nikiroo.utils.serial;
 
 import java.io.IOException;
+import java.io.InputStream;
 import java.lang.reflect.Field;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Scanner;
+import java.util.zip.GZIPInputStream;
 
-import be.nikiroo.utils.StringUtils;
+import be.nikiroo.utils.IOUtils;
+import be.nikiroo.utils.streams.Base64InputStream;
+import be.nikiroo.utils.streams.NextableInputStream;
+import be.nikiroo.utils.streams.NextableInputStreamStep;
 
 /**
  * A simple class that can accept the output of {@link Exporter} to recreate
@@ -43,7 +47,7 @@ public class Importer {
         * content, or a number of lines of it (any given line <b>MUST</b> be
         * complete though) and accumulate it with the already present data.
         * 
-        * @param data
+        * @param in
         *            the data to parse
         * 
         * @return itself so it can be chained
@@ -56,27 +60,57 @@ 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)
+        * @throws NullPointerException
+        *             if the stream is empty
         */
-       public Importer read(String data) throws NoSuchFieldException,
-                       NoSuchMethodException, ClassNotFoundException {
+       public Importer read(InputStream in) throws NoSuchFieldException,
+                       NoSuchMethodException, ClassNotFoundException, IOException,
+                       NullPointerException {
+
+               NextableInputStream stream = new NextableInputStream(in,
+                               new NextableInputStreamStep('\n'));
 
                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()));
-                                       read(line);
+                       if (in == null) {
+                               throw new NullPointerException("InputStream is null");
+                       }
+
+                       boolean first = true;
+                       while (stream.next()) {
+                               if (stream.eof()) {
+                                       if (first) {
+                                               throw new NullPointerException(
+                                                               "InputStream empty, normal termination");
+                                       }
+                                       return this;
+                               }
+                               first = false;
+
+                               boolean zip = stream.startsWiths("ZIP:");
+                               boolean b64 = stream.startsWiths("B64:");
+
+                               if (zip || b64) {
+                                       stream.skip("XXX:".length());
+
+                                       InputStream decoded = stream.open();
+                                       if (zip) {
+                                               decoded = new GZIPInputStream(decoded);
+                                       }
+                                       decoded = new Base64InputStream(decoded, false);
+
+                                       try {
+                                               read(decoded);
+                                       } finally {
+                                               decoded.close();
+                                       }
                                } else {
-                                       processLine(line);
+                                       processLine(stream);
                                }
                        }
-                       scan.close();
-               } catch (IOException e) {
-                       throw new NoSuchMethodException(
-                                       "Internal error when decoding ZIP content: input may be corrupt");
+               } finally {
+                       stream.close(false);
                }
 
                return this;
@@ -86,7 +120,7 @@ public class Importer {
         * Read a single (whole) line of serialised data into this {@link Importer}
         * and accumulate it with the already present data.
         * 
-        * @param line
+        * @param in
         *            the line to parse
         * 
         * @return TRUE if we are just done with one object or sub-object
@@ -99,12 +133,15 @@ 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 {
+       private boolean processLine(InputStream in) throws NoSuchFieldException,
+                       NoSuchMethodException, ClassNotFoundException, IOException {
+
                // Defer to latest child if any
                if (child != null) {
-                       if (child.processLine(line)) {
+                       if (child.processLine(in)) {
                                if (currentFieldName != null) {
                                        setField(currentFieldName, child.getValue());
                                        currentFieldName = null;
@@ -115,6 +152,13 @@ public class Importer {
                        return false;
                }
 
+               // TODO use the stream, Luke
+               String line = IOUtils.readSmallStream(in);
+
+               if (line.isEmpty()) {
+                       return false;
+               }
+
                if (line.equals("{")) { // START: new child if needed
                        if (link != null) {
                                child = new Importer(map);
@@ -146,7 +190,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 {