X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2Fserial%2FCustomSerializer.java;h=e5539c0fdce8669592a932c819d458b0717c1613;hb=23cf894daa02843da6e6f1b199eaaea29a739f81;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..e5539c0 100644
--- a/src/be/nikiroo/utils/serial/CustomSerializer.java
+++ b/src/be/nikiroo/utils/serial/CustomSerializer.java
@@ -4,6 +4,12 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 
+import be.nikiroo.utils.IOUtils;
+import be.nikiroo.utils.streams.NextableInputStream;
+import be.nikiroo.utils.streams.NextableInputStreamStep;
+import be.nikiroo.utils.streams.ReplaceInputStream;
+import be.nikiroo.utils.streams.ReplaceOutputStream;
+
 public abstract class CustomSerializer {
 
 	protected abstract void toStream(OutputStream out, Object value)
@@ -14,34 +20,76 @@ 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)
-	 * 
 	 * @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;
-		}
+	public void encode(OutputStream out, Object value) throws IOException {
+		ReplaceOutputStream replace = new ReplaceOutputStream(out, //
+				new String[] { "\\", "\n" }, //
+				new String[] { "\\\\", "\\n" });
 
-		return true;
+		try {
+			SerialUtils.write(replace, "custom^");
+			SerialUtils.write(replace, getType());
+			SerialUtils.write(replace, "^");
+			toStream(replace, value);
+		} finally {
+			replace.close(false);
+		}
 	}
 
-	public Object decode(String encodedValue) throws IOException {
-		return fromString((String) SerialUtils.decode(contentOf(encodedValue)));
+	public Object decode(InputStream in) throws IOException {
+		ReplaceInputStream replace = new ReplaceInputStream(in, //
+				new String[] { "\\\\", "\\n" }, //
+				new String[] { "\\", "\n" });
+
+		try {
+			NextableInputStream stream = new NextableInputStream(
+					replace.open(), 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");
+				}
+
+				return fromStream(stream);
+			} finally {
+				stream.close();
+			}
+		} finally {
+			replace.close(false);
+		}
 	}
 
 	public static boolean isCustom(String encodedValue) {