X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsonitus%2Fdata%2FPipeline.java;h=c63b272dcc79644098be360eef4e93ddefc0b729;hb=2f6ec5906ea398bc39d2fe85bc288191d2c97057;hp=ae4924b947a882494c68ba432446cb32e373eaec;hpb=58ada95cc9cda6e07371c5c560736bbb4eeba9da;p=sonitus.git

diff --git a/src/main/java/net/pterodactylus/sonitus/data/Pipeline.java b/src/main/java/net/pterodactylus/sonitus/data/Pipeline.java
index ae4924b..c63b272 100644
--- a/src/main/java/net/pterodactylus/sonitus/data/Pipeline.java
+++ b/src/main/java/net/pterodactylus/sonitus/data/Pipeline.java
@@ -72,19 +72,6 @@ public class Pipeline implements Iterable<Filter> {
 	private Pipeline(Filter source, Multimap<Filter, Filter> filters) {
 		this.source = Preconditions.checkNotNull(source, "source must not be null");
 		this.filters = ArrayListMultimap.create(Preconditions.checkNotNull(filters, "filters must not be null"));
-		for (Filter filter : Lists.reverse(filters())) {
-			logger.finest(String.format("Adding Listener to %s.", filter.name()));
-			filter.addMetadataListener(new MetadataListener() {
-
-				@Override
-				public void metadataUpdated(Filter filter, Metadata metadata) {
-					for (Filter sinks : filters(filter)) {
-						logger.fine(String.format("Updating Metadata from %s to %s as %s.", filter.name(), sinks.name(), metadata));
-						sinks.metadataUpdated(metadata);
-					}
-				}
-			});
-		}
 	}
 
 	//
@@ -151,15 +138,16 @@ public class Pipeline implements Iterable<Filter> {
 		}
 		List<Filter> filters = Lists.newArrayList();
 		filters.add(source);
-		source.open(Metadata.UNKNOWN);
+		Metadata currentMetadata = Metadata.UNKNOWN;
 		/* collect all source->sink pairs. */
 		while (!filters.isEmpty()) {
 			Filter filter = filters.remove(0);
+			logger.info(String.format("Opening %s with %s...", filter.name(), currentMetadata));
+			filter.open(currentMetadata);
+			currentMetadata = filter.metadata();
 			Collection<Filter> sinks = this.filters.get(filter);
 			connections.add(new Connection(filter, sinks));
 			for (Filter sink : sinks) {
-				logger.info(String.format("Opening %s with %s...", sink.name(), source.metadata()));
-				sink.open(filter.metadata());
 				filters.add(sink);
 			}
 		}
@@ -309,7 +297,7 @@ public class Pipeline implements Iterable<Filter> {
 	 *
 	 * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
 	 */
-	public class Connection implements Runnable {
+	public static class Connection implements Runnable {
 
 		/** The source. */
 		private final Filter source;
@@ -352,6 +340,24 @@ public class Pipeline implements Iterable<Filter> {
 		//
 
 		/**
+		 * Returns the source of this connection.
+		 *
+		 * @return The source of this connection
+		 */
+		public Filter source() {
+			return source;
+		}
+
+		/**
+		 * Returns the sinks of this connection.
+		 *
+		 * @return The sinks of this connection
+		 */
+		public Collection<Filter> sinks() {
+			return sinks;
+		}
+
+		/**
 		 * Returns the time this connection was started.
 		 *
 		 * @return The time this connection was started (in milliseconds since Jan 1,
@@ -389,11 +395,11 @@ public class Pipeline implements Iterable<Filter> {
 			startTime = System.currentTimeMillis();
 			while (!stopped.get()) {
 				try {
-					final byte[] buffer;
+					final DataPacket dataPacket;
 					try {
 						logger.finest(String.format("Getting %d bytes from %s...", 4096, source.name()));
-						buffer = source.get(4096);
-						logger.finest(String.format("Got %d bytes from %s.", buffer.length, source.name()));
+						dataPacket = source.get(4096);
+						logger.finest(String.format("Got %d bytes from %s.", dataPacket.buffer().length, source.name()));
 					} catch (IOException ioe1) {
 						throw new IOException(String.format("I/O error while reading from %s.", source.name()), ioe1);
 					}
@@ -406,9 +412,9 @@ public class Pipeline implements Iterable<Filter> {
 								@Override
 								public Void call() throws Exception {
 									try {
-										logger.finest(String.format("Sending %d bytes to %s.", buffer.length, sink.name()));
-										sink.process(buffer);
-										logger.finest(String.format("Sent %d bytes to %s.", buffer.length, sink.name()));
+										logger.finest(String.format("Sending %d bytes to %s.", dataPacket.buffer().length, sink.name()));
+										sink.process(dataPacket);
+										logger.finest(String.format("Sent %d bytes to %s.", dataPacket.buffer().length, sink.name()));
 									} catch (IOException ioe1) {
 										throw new IOException(String.format("I/O error while writing to %s", sink.name()), ioe1);
 									}
@@ -421,7 +427,7 @@ public class Pipeline implements Iterable<Filter> {
 					for (Future<Void> future : futures) {
 						future.get();
 					}
-					counter += buffer.length;
+					counter += dataPacket.buffer().length;
 				} catch (IOException e) {
 					/* TODO */
 					e.printStackTrace();