code cleanup, fix for ReplaceInputStream

[nikiroo-utils.git] / src / be / nikiroo / utils / streams / NextableInputStream.java

diff --git a/src/be/nikiroo/utils/streams/NextableInputStream.java b/src/be/nikiroo/utils/streams/NextableInputStream.java
index d023ad34482837b7896d75482d0bff85b98f9aa1..550aa24f459f2fe0fc1c28fe3efa80f606a59a88 100644 (file)
--- a/src/be/nikiroo/utils/streams/NextableInputStream.java
+++ b/src/be/nikiroo/utils/streams/NextableInputStream.java
@@ -2,6 +2,8 @@ package be.nikiroo.utils.streams;
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
+import java.util.Arrays;
 
 /**
  * This {@link InputStream} can be separated into sub-streams (you can process
@@ -85,6 +87,8 @@ public class NextableInputStream extends BufferedInputStream {
         * {@link IOException}s can happen when we have no data available in the
         * buffer; in that case, we fetch more data to know if we can have a next
         * sub-stream or not.
+        * <p>
+        * This is can be a blocking call when data need to be fetched.
         * 
         * @return TRUE if we unblocked the next sub-stream, FALSE if not
         * 
@@ -101,6 +105,8 @@ public class NextableInputStream extends BufferedInputStream {
         * <p>
         * That is, the next stream, if any, will be the last one and will not be
         * subject to the {@link NextableInputStreamStep}.
+        * <p>
+        * This is can be a blocking call when data need to be fetched.
         * 
         * @return TRUE if we unblocked the next sub-stream, FALSE if not
         * 
@@ -192,6 +198,8 @@ public class NextableInputStream extends BufferedInputStream {
        /**
         * The implementation of {@link NextableInputStream#next()} and
         * {@link NextableInputStream#nextAll()}.
+        * <p>
+        * This is can be a blocking call when data need to be fetched.
         * 
         * @param all
         *            TRUE for {@link NextableInputStream#nextAll()}, FALSE for
@@ -212,8 +220,6 @@ public class NextableInputStream extends BufferedInputStream {
                        if (all) {
                                step = null;
                        }
-
-                       return true;
                }
 
                if (step != null && !hasMoreData() && stopped) {
@@ -227,11 +233,41 @@ public class NextableInputStream extends BufferedInputStream {
                        }
 
                        checkBuffer(false);
+               }
+
+               // consider that if EOF, there is no next
+               if (start >= stop) {
+                       // Make sure, block if necessary
+                       preRead();
 
-                       // consider that if EOF, there is no next
                        return hasMoreData();
                }
 
-               return false;
+               return true;
+       }
+
+       /**
+        * Display a DEBUG {@link String} representation of this object.
+        * <p>
+        * Do <b>not</b> use for release code.
+        */
+       @Override
+       public String toString() {
+               String data = "";
+               if (stop > 0) {
+                       try {
+                               data = new String(Arrays.copyOfRange(buffer, 0, stop), "UTF-8");
+                       } catch (UnsupportedEncodingException e) {
+                       }
+                       if (data.length() > 50) {
+                               data = data.substring(0, 47) + "...";
+                       }
+               }
+               String rep = String.format(
+                               "Nextable %s: %d -> %d [eof: %s] [more data: %s]: %s",
+                               (stopped ? "stopped" : "running"), start, stop, "" + eof, ""
+                                               + hasMoreData(), data);
+
+               return rep;
        }
 }