X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsonitus%2Fdata%2Fsource%2FFileSource.java;h=7251f654d107ac7f10678990ffe6631e49c622e2;hb=633a841142f978235ed9f745b6ba16c278963e62;hp=840bd9fc6340693d7a125978034a533373aa7f1d;hpb=f761d816f6e2f14bc80efb45e4cb5c130fa9a57f;p=sonitus.git
diff --git a/src/main/java/net/pterodactylus/sonitus/data/source/FileSource.java b/src/main/java/net/pterodactylus/sonitus/data/source/FileSource.java
index 840bd9f..7251f65 100644
--- a/src/main/java/net/pterodactylus/sonitus/data/source/FileSource.java
+++ b/src/main/java/net/pterodactylus/sonitus/data/source/FileSource.java
@@ -27,27 +27,25 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.List;
+import net.pterodactylus.sonitus.data.AbstractFilter;
import net.pterodactylus.sonitus.data.Controller;
+import net.pterodactylus.sonitus.data.Filter;
import net.pterodactylus.sonitus.data.Metadata;
-import net.pterodactylus.sonitus.data.Source;
import net.pterodactylus.sonitus.io.IdentifyingInputStream;
import com.google.common.base.Optional;
/**
- * A {@link net.pterodactylus.sonitus.data.Source} that is read from the local
- * file system.
+ * A {@link Filter} that reads a file from the local file system and does not
+ * expect any input.
*
* @author David âBombeâ Roden
*/
-public class FileSource implements Source {
+public class FileSource extends AbstractFilter {
/** The path of the file. */
private final String path;
- /** The identified metadata of the file. */
- private final Metadata metadata;
-
/** The input stream. */
private InputStream fileInputStream;
@@ -60,21 +58,22 @@ public class FileSource implements Source {
* if the file can not be found, or an I/O error occurs
*/
public FileSource(String path) throws IOException {
+ super(path);
this.path = checkNotNull(path, "path must not be null");
fileInputStream = new FileInputStream(path);
/* identify file type. */
Optional identifyingInputStream = IdentifyingInputStream.create(new FileInputStream(path));
if (identifyingInputStream.isPresent()) {
- metadata = identifyingInputStream.get().metadata();
+ metadataUpdated(identifyingInputStream.get().metadata());
} else {
/* fallback. */
- metadata = new Metadata().name(path);
+ metadataUpdated(new Metadata().name(path));
}
}
//
- // CONTROLLED METHODS
+ // FILTER METHODS
//
@Override
@@ -82,10 +81,6 @@ public class FileSource implements Source {
return Collections.emptyList();
}
- //
- // SOURCE METHODS
- //
-
@Override
public byte[] get(int bufferSize) throws IOException {
byte[] buffer = new byte[bufferSize];
@@ -96,18 +91,13 @@ public class FileSource implements Source {
return Arrays.copyOf(buffer, read);
}
- @Override
- public Metadata metadata() {
- return metadata;
- }
-
//
// OBJECT METHODS
//
@Override
public String toString() {
- return String.format("%s (%s)", path, metadata);
+ return String.format("%s (%s)", path, metadata());
}
}