X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2Fserial%2FImporter.java;fp=src%2Fbe%2Fnikiroo%2Futils%2Fserial%2FImporter.java;h=2608db272bf85373b0fcecda52aa8e76563b904c;hb=d2219aa05bbcc5603e90aa69220fecb4a6a41f55;hp=6718fb8ecf623b8bd66350be1d1f51685836b2cf;hpb=d251f3dd38a8f9d369a7cf627185eacc4f66ece5;p=nikiroo-utils.git

diff --git a/src/be/nikiroo/utils/serial/Importer.java b/src/be/nikiroo/utils/serial/Importer.java
index 6718fb8..2608db2 100644
--- a/src/be/nikiroo/utils/serial/Importer.java
+++ b/src/be/nikiroo/utils/serial/Importer.java
@@ -169,65 +169,93 @@ public class Importer {
 		// Custom objects
 		if (CustomSerializer.isCustom(in)) {
 			// not a field value but a direct value
-			String line = IOUtils.readSmallStream(in);
-			me = SerialUtils.decode(line);
+			me = SerialUtils.decode(in);
 			return false;
 		}
 
-		// TODO use the stream, Luke
-		// .. at least for REF
-		String line = IOUtils.readSmallStream(in);
-
-		if (line.startsWith("REF ")) { // REF: create/link self
-			// TODO: here, line is REF type@999:xxx
+		// REF: (object)
+		if (in.startsWith("REF ")) { // REF: create/link self
+			// here, line is REF type@999:xxx
 			// xxx is optional
-			// note: use .end() when containsKey(ref)
-			String[] tab = line.substring("REF ".length()).split("@");
-			String type = tab[0];
-			tab = tab[1].split(":");
-			String ref = tab[0];
-
-			link = map.containsKey(ref);
-			if (link) {
-				me = map.get(ref);
-			} else {
-				if (line.endsWith(":")) {
-					// construct
-					me = SerialUtils.createObject(type);
+
+			NextableInputStream stream = new NextableInputStream(in,
+					new NextableInputStreamStep(':'));
+			try {
+				stream.next();
+
+				stream.skip("REF ".length());
+				String header = IOUtils.readSmallStream(stream);
+
+				String[] tab = header.split("@");
+				if (tab.length != 2) {
+					throw new IOException("Bad import header line: " + header);
+				}
+				String type = tab[0];
+				String ref = tab[1];
+
+				stream.nextAll();
+
+				link = map.containsKey(ref);
+				if (link) {
+					me = map.get(ref);
+					stream.end();
 				} else {
-					// direct value
-					int pos = line.indexOf(":");
-					String encodedValue = line.substring(pos + 1);
-					me = SerialUtils.decode(encodedValue);
+					if (stream.eof()) {
+						// construct
+						me = SerialUtils.createObject(type);
+					} else {
+						// direct value
+						me = SerialUtils.decode(stream);
+					}
+					map.put(ref, me);
 				}
-				map.put(ref, me);
+			} finally {
+				stream.close(false);
 			}
-		} else { // FIELD: new field *or* direct simple value
-			if (line.endsWith(":")) {
-				// field value is compound
-				currentFieldName = line.substring(0, line.length() - 1);
-			} else if (line.startsWith(":") || !line.contains(":")
-					|| line.startsWith("\"")) {
-				// not a field value but a direct value
-				me = SerialUtils.decode(line);
-			} else {
-				// field value is direct
-				int pos = line.indexOf(":");
-				String fieldName = line.substring(0, pos);
-				String encodedValue = line.substring(pos + 1);
-				Object value = null;
-				value = SerialUtils.decode(encodedValue);
-
-				// To support simple types directly:
-				if (me == null) {
-					me = value;
+
+			return false;
+		}
+
+		if (SerialUtils.isDirectValue(in)) {
+			// not a field value but a direct value
+			me = SerialUtils.decode(in);
+			return false;
+		}
+
+		if (in.startsWith("^")) {
+			in.skip(1);
+
+			NextableInputStream nameThenContent = new NextableInputStream(in,
+					new NextableInputStreamStep(':'));
+
+			try {
+				nameThenContent.next();
+				String fieldName = IOUtils.readSmallStream(nameThenContent);
+
+				if (nameThenContent.next() && !nameThenContent.eof()) {
+					// field value is direct or custom
+					Object value = null;
+					value = SerialUtils.decode(nameThenContent);
+
+					// To support simple types directly:
+					if (me == null) {
+						me = value;
+					} else {
+						setField(fieldName, value);
+					}
 				} else {
-					setField(fieldName, value);
+					// field value is compound
+					currentFieldName = fieldName;
 				}
+			} finally {
+				nameThenContent.close(false);
 			}
+
+			return false;
 		}
 
-		return false;
+		String line = IOUtils.readSmallStream(in);
+		throw new IOException("Line cannot be processed: <" + line + ">");
 	}
 
 	private void setField(String name, Object value)