X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsonitus%2Fdata%2Fsource%2FFileSource.java;h=2829a4205c74089cd4b97af61661ab71ec08e517;hb=87436ac0b103a112722c1df835e11ec928e57d38;hp=010eeb9b773c85829804a307f124aad046d0a781;hpb=e856fa2e451dbc626a5269fc14d01bca935db39a;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 010eeb9..2829a42 100644
--- a/src/main/java/net/pterodactylus/sonitus/data/source/FileSource.java
+++ b/src/main/java/net/pterodactylus/sonitus/data/source/FileSource.java
@@ -17,30 +17,31 @@
 
 package net.pterodactylus.sonitus.data.source;
 
-import static com.google.common.base.Preconditions.*;
-import static net.pterodactylus.sonitus.data.Metadata.UNKNOWN_CHANNELS;
-import static net.pterodactylus.sonitus.data.Metadata.UNKNOWN_ENCODING;
-import static net.pterodactylus.sonitus.data.Metadata.UNKNOWN_FREQUENCY;
+import static com.google.common.base.Preconditions.checkNotNull;
 
 import java.io.EOFException;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
 
+import net.pterodactylus.sonitus.data.AbstractControlledComponent;
+import net.pterodactylus.sonitus.data.Controller;
 import net.pterodactylus.sonitus.data.Metadata;
 import net.pterodactylus.sonitus.data.Source;
 import net.pterodactylus.sonitus.io.IdentifyingInputStream;
 
 import com.google.common.base.Optional;
-import com.google.common.io.ByteStreams;
 
 /**
- * A {@link Source} that is read from the local file system.
+ * A {@link net.pterodactylus.sonitus.data.Source} that is read from the local
+ * file system.
  *
  * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
-public class FileSource implements Source {
+public class FileSource extends AbstractControlledComponent implements Source {
 
 	/** The path of the file. */
 	private final String path;
@@ -56,7 +57,7 @@ public class FileSource implements Source {
 	 *
 	 * @param path
 	 * 		The path of the file
-	 * @throws IOException
+	 * @throws java.io.IOException
 	 * 		if the file can not be found, or an I/O error occurs
 	 */
 	public FileSource(String path) throws IOException {
@@ -69,29 +70,43 @@ public class FileSource implements Source {
 			metadata = identifyingInputStream.get().metadata();
 		} else {
 			/* fallback. */
-			metadata = new Metadata(UNKNOWN_CHANNELS, UNKNOWN_FREQUENCY, UNKNOWN_ENCODING).name(path);
+			metadata = new Metadata().name(path);
 		}
 	}
 
 	//
-	// SOURCE METHODS
+	// CONTROLLED METHODS
 	//
 
 	@Override
-	public Metadata metadata() {
-		return metadata;
+	public String name() {
+		return path;
 	}
 
 	@Override
+	public List<Controller<?>> controllers() {
+		return Collections.emptyList();
+	}
+
+	//
+	// SOURCE METHODS
+	//
+
+	@Override
 	public byte[] get(int bufferSize) throws IOException {
 		byte[] buffer = new byte[bufferSize];
-		int read = ByteStreams.read(fileInputStream, buffer, 0, bufferSize);
-		if (read == 0) {
+		int read = fileInputStream.read(buffer);
+		if (read == -1) {
 			throw new EOFException();
 		}
 		return Arrays.copyOf(buffer, read);
 	}
 
+	@Override
+	public Metadata metadata() {
+		return metadata;
+	}
+
 	//
 	// OBJECT METHODS
 	//