X-Git-Url: https://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2Fserial%2FCustomSerializer.java;h=e29e8cf93969e950a096ece9d48d14a9a81576be;hb=be6f67896f1412f87ebae15660713e918d37e0a0;hp=c5f79ff0331ae856596b4f2390b667d80245dbe4;hpb=68532958426cd3c6187aa89eae4f137bc057293b;p=nikiroo-utils.git

diff --git a/src/be/nikiroo/utils/serial/CustomSerializer.java b/src/be/nikiroo/utils/serial/CustomSerializer.java
index c5f79ff..e29e8cf 100644
--- a/src/be/nikiroo/utils/serial/CustomSerializer.java
+++ b/src/be/nikiroo/utils/serial/CustomSerializer.java
@@ -4,6 +4,10 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 
+import be.nikiroo.utils.IOUtils;
+import be.nikiroo.utils.NextableInputStream;
+import be.nikiroo.utils.NextableInputStreamStep;
+
 public abstract class CustomSerializer {
 
 	protected abstract void toStream(OutputStream out, Object value)
@@ -14,34 +18,68 @@ public abstract class CustomSerializer {
 	protected abstract String getType();
 
 	/**
-	 * Encode the object into the given {@link OutputStream} if possible (if
-	 * supported).
+	 * Encode the object into the given {@link OutputStream} if supported.
 	 * 
 	 * @param out
 	 *            the builder to append to
 	 * @param value
 	 *            the object to encode
 	 * 
-	 * @return TRUE if success, FALSE if not (the content of the builder won't
-	 *         be changed in case of failure)
+	 * @return FALSE if the value is not supported, TRUE if the operation was
+	 *         successful (if the value is supported by the operation was not
+	 *         successful, you will get an {@link IOException})
 	 * 
 	 * @throws IOException
 	 *             in case of I/O error
 	 */
 	public boolean encode(OutputStream out, Object value) throws IOException {
-		InputStream customString = toStream(out, value);
 		SerialUtils.write(out, "custom^");
 		SerialUtils.write(out, getType());
 		SerialUtils.write(out, "^");
-		if (!SerialUtils.encode(out, customString)) {
-			return false;
-		}
+		// TODO: manage ENTER
+		toStream(out, value);
 
 		return true;
 	}
 
-	public Object decode(String encodedValue) throws IOException {
-		return fromString((String) SerialUtils.decode(contentOf(encodedValue)));
+	public Object decode(InputStream in) throws IOException {
+		// TODO: manage ENTER
+		NextableInputStream stream = new NextableInputStream(in,
+				new NextableInputStreamStep('^'));
+
+		try {
+			if (!stream.next()) {
+				throw new IOException("Cannot find the first custom^ element");
+			}
+
+			String custom = IOUtils.readSmallStream(stream);
+			if (!"custom".equals(custom)) {
+				throw new IOException(
+						"Cannot find the first custom^ element, it is: "
+								+ custom + "^");
+			}
+
+			if (!stream.next()) {
+				throw new IOException("Cannot find the second custom^"
+						+ getType() + " element");
+			}
+
+			String type = IOUtils.readSmallStream(stream);
+			if (!getType().equals(type)) {
+				throw new IOException("Cannot find the second custom^"
+						+ getType() + " element, it is: custom^" + type + "^");
+			}
+
+			if (!stream.nextAll()) {
+				throw new IOException("Cannot find the third custom^"
+						+ getType() + "^value element");
+			}
+
+			// TODO: manage ENTER
+			return fromStream(stream);
+		} finally {
+			stream.close(false);
+		}
 	}
 
 	public static boolean isCustom(String encodedValue) {