X-Git-Url: https://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2Fserial%2FImporter.java;h=810d694db5a316a4aca1290b5b31650312005f0d;hb=95c5b4f9f95b6b934622393d851fc7e67966a8c2;hp=5d7d8d05ee30e298b802125abc63128c748ccb88;hpb=dc41a952e6375fe6aa1579614fe717d260fc78a5;p=nikiroo-utils.git

diff --git a/src/be/nikiroo/utils/serial/Importer.java b/src/be/nikiroo/utils/serial/Importer.java
index 5d7d8d0..810d694 100644
--- a/src/be/nikiroo/utils/serial/Importer.java
+++ b/src/be/nikiroo/utils/serial/Importer.java
@@ -7,9 +7,9 @@ import java.util.HashMap;
 import java.util.Map;
 
 import be.nikiroo.utils.IOUtils;
-import be.nikiroo.utils.NextableInputStream;
-import be.nikiroo.utils.NextableInputStreamStep;
 import be.nikiroo.utils.StringUtils;
+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
@@ -46,7 +46,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
@@ -68,37 +68,43 @@ public class Importer {
 			NoSuchMethodException, ClassNotFoundException, IOException,
 			NullPointerException {
 
-		// TODO: fix NexInStream: next() MUST be called first time, too
-		// TODO: NexInStream: add getBytes() (size downloaded)
-		// TODO: public InputStrem open() (open/close do nothing)
-		// TODO: public boolean eof()
-		// TODO: public nextAll(): next, but disable separation of sub-streams
-		// TODO: close(alsoCloseIncludedField)
-
 		NextableInputStream stream = new NextableInputStream(in,
 				new NextableInputStreamStep('\n'));
 
-		if (in == null || stream.eof()) {
+		try {
 			if (in == null) {
 				throw new NullPointerException("InputStream is null");
 			}
-			throw new NullPointerException("InputStream is empty");
-		}
 
-		while (stream.next()) {
-			boolean zip = stream.startsWiths("ZIP:");
-			boolean b64 = stream.startsWiths("B64:");
-
-			if (zip || b64) {
-				InputStream decoded = StringUtils.unbase64(stream.open(), zip);
-				try {
-					read(decoded);
-				} finally {
-					decoded.close();
+			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 = StringUtils.unbase64(stream.open(),
+							zip);
+					try {
+						read(decoded);
+					} finally {
+						decoded.close();
+					}
+				} else {
+					processLine(stream);
 				}
-			} else {
-				processLine(stream);
 			}
+		} finally {
+			stream.close(false);
 		}
 
 		return this;
@@ -108,7 +114,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
@@ -143,6 +149,10 @@ public class Importer {
 		// 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);
@@ -161,7 +171,12 @@ public class Importer {
 			} else {
 				if (line.endsWith(":")) {
 					// construct
-					me = SerialUtils.createObject(type);
+					try {
+						me = SerialUtils.createObject(type);
+					} catch (NoSuchMethodException e) {
+						System.out.println("LINE: <" + line + ">");
+						throw e;
+					}
 				} else {
 					// direct value
 					int pos = line.indexOf(":");
@@ -217,37 +232,6 @@ public class Importer {
 		}
 	}
 
-	/**
-	 * Find the given needle in the data and return its position (or -1 if not
-	 * found).
-	 * 
-	 * @param data
-	 *            the data to look through
-	 * @param offset
-	 *            the offset at wich to start searching
-	 * @param needle
-	 *            the needle to find
-	 * 
-	 * @return the position of the needle if found, -1 if not found
-	 */
-	private int find(byte[] data, int offset, byte[] needle) {
-		for (int i = offset; i + needle.length - 1 < data.length; i++) {
-			boolean same = true;
-			for (int j = 0; j < needle.length; j++) {
-				if (data[i + j] != needle[j]) {
-					same = false;
-					break;
-				}
-			}
-
-			if (same) {
-				return i;
-			}
-		}
-
-		return -1;
-	}
-
 	/**
 	 * Return the current deserialised value.
 	 *