X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsonitus%2Fdata%2Fsink%2FIcecast2Sink.java;h=87d94969a35114a2ecfc990bb467a948838bd75a;hb=3aca6eb7580456837944877d798f207c4a82e964;hp=89a930c36c2a25416808f98da8289ca27797cd68;hpb=f761d816f6e2f14bc80efb45e4cb5c130fa9a57f;p=sonitus.git

diff --git a/src/main/java/net/pterodactylus/sonitus/data/sink/Icecast2Sink.java b/src/main/java/net/pterodactylus/sonitus/data/sink/Icecast2Sink.java
index 89a930c..87d9496 100644
--- a/src/main/java/net/pterodactylus/sonitus/data/sink/Icecast2Sink.java
+++ b/src/main/java/net/pterodactylus/sonitus/data/sink/Icecast2Sink.java
@@ -23,7 +23,6 @@ import java.io.OutputStream;
 import java.io.UnsupportedEncodingException;
 import java.net.Socket;
 import java.net.URLEncoder;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.logging.Level;
@@ -32,12 +31,10 @@ import java.util.logging.Logger;
 import net.pterodactylus.sonitus.data.Controller;
 import net.pterodactylus.sonitus.data.Metadata;
 import net.pterodactylus.sonitus.data.Sink;
+import net.pterodactylus.sonitus.data.event.MetadataUpdated;
 import net.pterodactylus.sonitus.io.InputStreamDrainer;
 
-import com.google.common.base.Function;
-import com.google.common.base.Joiner;
-import com.google.common.base.Optional;
-import com.google.common.collect.FluentIterable;
+import com.google.common.eventbus.EventBus;
 import com.google.common.io.BaseEncoding;
 import com.google.common.io.Closeables;
 
@@ -52,6 +49,9 @@ public class Icecast2Sink implements Sink {
 	/** The logger. */
 	private static final Logger logger = Logger.getLogger(Icecast2Sink.class.getName());
 
+	/** The event bus. */
+	private final EventBus eventBus;
+
 	/** The server name. */
 	private final String server;
 
@@ -76,11 +76,17 @@ public class Icecast2Sink implements Sink {
 	/** Whether to publish the server. */
 	private final boolean publishServer;
 
+	/** The output stream to the server. */
 	private OutputStream socketOutputStream;
 
+	/** The current metadata. */
+	private Metadata metadata;
+
 	/**
 	 * Creates a new Icecast2 sink.
 	 *
+	 * @param eventBus
+	 * 		The event bus
 	 * @param server
 	 * 		The hostname of the server
 	 * @param port
@@ -99,7 +105,8 @@ public class Icecast2Sink implements Sink {
 	 * 		{@code true} to publish the server in a public directory, {@code false} to
 	 * 		not publish it
 	 */
-	public Icecast2Sink(String server, int port, String password, String mountPoint, String serverName, String serverDescription, String genre, boolean publishServer) {
+	public Icecast2Sink(EventBus eventBus, String server, int port, String password, String mountPoint, String serverName, String serverDescription, String genre, boolean publishServer) {
+		this.eventBus = eventBus;
 		this.server = server;
 		this.port = port;
 		this.password = password;
@@ -115,6 +122,16 @@ public class Icecast2Sink implements Sink {
 	//
 
 	@Override
+	public String name() {
+		return String.format("icecast://%s:%d/%s", server, port, mountPoint);
+	}
+
+	@Override
+	public Metadata metadata() {
+		return metadata;
+	}
+
+	@Override
 	public List<Controller<?>> controllers() {
 		return Collections.emptyList();
 	}
@@ -157,17 +174,12 @@ public class Icecast2Sink implements Sink {
 
 	@Override
 	public void metadataUpdated(final Metadata metadata) {
+		this.metadata = metadata;
 		new Thread(new Runnable() {
 
 			@Override
 			public void run() {
-				String metadataString = String.format("%s (%s)", Joiner.on(" - ").skipNulls().join(FluentIterable.from(Arrays.asList(metadata.artist(), metadata.name())).transform(new Function<Optional<String>, Object>() {
-
-					@Override
-					public Object apply(Optional<String> input) {
-						return input.orNull();
-					}
-				})), "Sonitus");
+				String metadataString = String.format("%s (%s)", metadata.title(), "Sonitus");
 				logger.info(String.format("Updating metadata to %s", metadataString));
 
 				Socket socket = null;
@@ -197,6 +209,7 @@ public class Icecast2Sink implements Sink {
 				}
 			}
 		}).start();
+		eventBus.post(new MetadataUpdated(this, metadata));
 	}
 
 	@Override