X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2Fserial%2FImporter.java;h=5d7d8d05ee30e298b802125abc63128c748ccb88;hb=1d20e650389b5aaaaa5de4213cefefade582da5d;hp=84fb5aae5742f49bcf68cd915906a2b7322a399b;hpb=a359464fcf59af8abc6f69ae0e88e42adc6018df;p=nikiroo-utils.git

diff --git a/src/be/nikiroo/utils/serial/Importer.java b/src/be/nikiroo/utils/serial/Importer.java
index 84fb5aa..5d7d8d0 100644
--- a/src/be/nikiroo/utils/serial/Importer.java
+++ b/src/be/nikiroo/utils/serial/Importer.java
@@ -1,11 +1,14 @@
 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 be.nikiroo.utils.IOUtils;
+import be.nikiroo.utils.NextableInputStream;
+import be.nikiroo.utils.NextableInputStreamStep;
 import be.nikiroo.utils.StringUtils;
 
 /**
@@ -58,40 +61,44 @@ public class Importer {
 	 *             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, IOException {
+	public Importer read(InputStream in) throws NoSuchFieldException,
+			NoSuchMethodException, ClassNotFoundException, IOException,
+			NullPointerException {
 
-		Scanner scan = new Scanner(data);
-		try {
-			scan.useDelimiter("\n");
-			while (scan.hasNext()) {
-				String line = scan.next();
-
-				if (line.startsWith("ZIP:")) {
-					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);
+		// 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()) {
+			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();
 				}
+			} else {
+				processLine(stream);
 			}
-		} finally {
-			scan.close();
 		}
 
 		return this;
@@ -117,11 +124,12 @@ public class Importer {
 	 * @throws IOException
 	 *             if the content cannot be read (for instance, corrupt data)
 	 */
-	private boolean processLine(String line) throws NoSuchFieldException,
+	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;
@@ -132,6 +140,9 @@ public class Importer {
 			return false;
 		}
 
+		// TODO use the stream, Luke
+		String line = IOUtils.readSmallStream(in);
+
 		if (line.equals("{")) { // START: new child if needed
 			if (link != null) {
 				child = new Importer(map);
@@ -206,6 +217,37 @@ 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.
 	 *