en cours, 3

[nikiroo-utils.git] / src / be / nikiroo / utils / serial / CustomSerializer.java

diff --git a/src/be/nikiroo/utils/serial/CustomSerializer.java b/src/be/nikiroo/utils/serial/CustomSerializer.java
index c5f79ff0331ae856596b4f2390b667d80245dbe4..9c3ef8c425577bba30dd327fedf9e4d4348e80ac 100644 (file)
--- 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,69 @@ 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
+               // TODO read and skip "custom^......^": next(), next(), nextAll() ?
+               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) {