Move format into metadata.

[sonitus.git] / src / main / java / net / pterodactylus / sonitus / data / filter / ExternalFilter.java

diff --git a/src/main/java/net/pterodactylus/sonitus/data/filter/ExternalFilter.java b/src/main/java/net/pterodactylus/sonitus/data/filter/ExternalFilter.java
index 5b4fc2c..9e298b4 100644 (file)
--- a/src/main/java/net/pterodactylus/sonitus/data/filter/ExternalFilter.java
+++ b/src/main/java/net/pterodactylus/sonitus/data/filter/ExternalFilter.java
@@ -29,8 +29,9 @@ import java.util.logging.Logger;
 import net.pterodactylus.sonitus.data.ConnectException;
 import net.pterodactylus.sonitus.data.Connection;
 import net.pterodactylus.sonitus.data.Filter;
-import net.pterodactylus.sonitus.data.Format;
+import net.pterodactylus.sonitus.data.Metadata;
 import net.pterodactylus.sonitus.data.Source;
+import net.pterodactylus.sonitus.io.InputStreamDrainer;
 
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
@@ -46,26 +47,30 @@ import com.google.common.io.ByteStreams;
 public abstract class ExternalFilter implements Filter {
 
        /** The logger. */
-       private static final Logger logger = Logger.getLogger(ExternalFilter.class.getName());
+       private final Logger logger = Logger.getLogger(getClass().getName());
 
-       /** The format of the source. */
-       private Format format;
+       /** The source. */
+       private Source source;
 
        /** The input stream that will hold the converted source. */
        private PipedInputStream pipedInputStream;
 
        //
        // FILTER METHODS
+       //
 
        @Override
-       public Format format() {
-               return format;
+       public Metadata metadata() {
+               return source.metadata();
        }
 
        @Override
        public byte[] get(int bufferSize) throws EOFException, IOException {
                byte[] buffer = new byte[bufferSize];
                int read = pipedInputStream.read(buffer);
+               if (read == -1) {
+                       throw new EOFException();
+               }
                return Arrays.copyOf(buffer, read);
        }
 
@@ -73,26 +78,15 @@ public abstract class ExternalFilter implements Filter {
        public void connect(Source source) throws ConnectException {
                Preconditions.checkNotNull(source, "source must not be null");
 
-               format = source.format();
+               this.source = source;
                try {
-                       final Process process = Runtime.getRuntime().exec(Iterables.toArray(ImmutableList.<String>builder().add(binary(format)).addAll(parameters(format)).build(), String.class));
+                       final Process process = Runtime.getRuntime().exec(Iterables.toArray(ImmutableList.<String>builder().add(binary(source.metadata())).addAll(parameters(source.metadata())).build(), String.class));
                        final InputStream processOutput = process.getInputStream();
                        final OutputStream processInput = process.getOutputStream();
                        final InputStream processError = process.getErrorStream();
                        final PipedOutputStream pipedOutputStream = new PipedOutputStream();
                        pipedInputStream = new PipedInputStream(pipedOutputStream);
-                       new Thread(new Runnable() {
-
-                               @Override
-                               public void run() {
-                                       try {
-                                               drainInputStream(processError);
-                                       } catch (IOException ioe1) {
-                                               /* ignore, just let the thread exit. */
-                                       }
-                                       logger.finest("ExternalFilter: Reading stderr finished.");
-                               }
-                       }).start();
+                       new Thread(new InputStreamDrainer(processError)).start();
                        new Thread(new Runnable() {
 
                                @Override
@@ -102,7 +96,7 @@ public abstract class ExternalFilter implements Filter {
                                        } catch (IOException ioe1) {
                                                /* okay, just exit. */
                                        }
-                                       logger.finest("ExternalFilter: Reading stdout finished.");
+                                       logger.finest("Reading stdout finished.");
                                }
                        }).start();
                        new Thread(new Connection(source) {
@@ -115,6 +109,7 @@ public abstract class ExternalFilter implements Filter {
                                @Override
                                protected void feed(byte[] buffer) throws IOException {
                                        processInput.write(buffer);
+                                       processInput.flush();
                                }
 
                                @Override
@@ -129,6 +124,11 @@ public abstract class ExternalFilter implements Filter {
                }
        }
 
+       @Override
+       public void metadataUpdated() {
+               /* ignore. */
+       }
+
        //
        // SUBCLASS METHODS
        //
@@ -136,32 +136,19 @@ public abstract class ExternalFilter implements Filter {
        /**
         * Returns the location of the binary to execute.
         *
-        * @param format
-        *              The format being processed
+        * @param metadata
+        *              The metadata being processed
         * @return The location of the binary to execute
         */
-       protected abstract String binary(Format format);
+       protected abstract String binary(Metadata metadata);
 
        /**
         * Returns the parameters for the binary.
         *
-        * @param format
-        *              The format being processed
+        * @param metadata
+        *              The metadata being processed
         * @return The parameters for the binary
         */
-       protected abstract Iterable<String> parameters(Format format);
-
-       //
-       // STATIC METHODS
-       //
-
-       private static void drainInputStream(InputStream inputStream) throws IOException {
-               byte[] buffer = new byte[4096];
-               int read;
-               while ((read = inputStream.read(buffer)) != -1) {
-                       logger.finest(String.format("ExternalFilter: Drained %d Bytes.", read));
-                       /* do nothing, just read the damn thing. */
-               }
-       }
+       protected abstract Iterable<String> parameters(Metadata metadata);
 
 }