X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsonitus%2Fdata%2Fsource%2FFileSource.java;h=9aff8d401289cb9ed4644c83265b7e626a8acbb2;hb=cbeadf6d9eea57ab98cacd60e2419dd3c18bef89;hp=cc61ce0ae0bb45a15a113fc1ab1e9ec929ccdf40;hpb=b74bb6374b5b3f4d0f30fefe8771e9c48ceead13;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 cc61ce0..9aff8d4 100644
--- a/src/main/java/net/pterodactylus/sonitus/data/source/FileSource.java
+++ b/src/main/java/net/pterodactylus/sonitus/data/source/FileSource.java
@@ -17,37 +17,35 @@
 
 package net.pterodactylus.sonitus.data.source;
 
-import static com.google.common.base.Preconditions.*;
-import static net.pterodactylus.sonitus.data.Format.UNKNOWN_CHANNELS;
-import static net.pterodactylus.sonitus.data.Format.UNKNOWN_ENCODING;
-import static net.pterodactylus.sonitus.data.Format.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.Format;
+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;
 
-	/** The identified format of the file. */
-	private final Format format;
-
 	/** The input stream. */
 	private InputStream fileInputStream;
 
@@ -56,37 +54,42 @@ 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 {
+		super(path);
 		this.path = checkNotNull(path, "path must not be null");
 		fileInputStream = new FileInputStream(path);
 
 		/* identify file type. */
 		Optional<IdentifyingInputStream> identifyingInputStream = IdentifyingInputStream.create(new FileInputStream(path));
 		if (identifyingInputStream.isPresent()) {
-			format = identifyingInputStream.get().format();
+			metadataUpdated(identifyingInputStream.get().metadata());
 		} else {
 			/* fallback. */
-			format = new Format(UNKNOWN_CHANNELS, UNKNOWN_FREQUENCY, UNKNOWN_ENCODING);
+			metadataUpdated(new Metadata().name(path));
 		}
 	}
 
 	//
-	// SOURCE METHODS
+	// CONTROLLED METHODS
 	//
 
 	@Override
-	public Format format() {
-		return format;
+	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);
@@ -98,7 +101,7 @@ public class FileSource implements Source {
 
 	@Override
 	public String toString() {
-		return String.format("%s (%s)", path, format);
+		return String.format("%s (%s)", path, metadata());
 	}
 
 }