Store the source instead of only the format.

[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 c2f6715..73d4b5f 100644 (file)
--- a/src/main/java/net/pterodactylus/sonitus/data/filter/ExternalFilter.java
+++ b/src/main/java/net/pterodactylus/sonitus/data/filter/ExternalFilter.java
@@ -49,24 +49,28 @@ public abstract class ExternalFilter implements Filter {
        /** The logger. */
        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;
+               return source.format();
        }
 
        @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);
        }
 
@@ -74,9 +78,9 @@ 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.format())).addAll(parameters(source.format())).build(), String.class));
                        final InputStream processOutput = process.getInputStream();
                        final OutputStream processInput = process.getOutputStream();
                        final InputStream processError = process.getErrorStream();