X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fxdcc%2Fui%2Fstdin%2FCommandReader.java;h=a530a1d28935d9e2a397b3259a8c1d452a11b210;hb=6df6da151ec3804a8f3cc8ac65277842358d7e38;hp=74b365a97a2e7ee11365183027cf9e44524c88f4;hpb=a3fb82f62375a86c959ab6a84995fb142bca7162;p=xudocci.git

diff --git a/src/main/java/net/pterodactylus/xdcc/ui/stdin/CommandReader.java b/src/main/java/net/pterodactylus/xdcc/ui/stdin/CommandReader.java
index 74b365a..a530a1d 100644
--- a/src/main/java/net/pterodactylus/xdcc/ui/stdin/CommandReader.java
+++ b/src/main/java/net/pterodactylus/xdcc/ui/stdin/CommandReader.java
@@ -32,6 +32,7 @@ import net.pterodactylus.xdcc.core.Core;
 import net.pterodactylus.xdcc.core.event.DownloadFailed;
 import net.pterodactylus.xdcc.core.event.DownloadFinished;
 import net.pterodactylus.xdcc.core.event.DownloadStarted;
+import net.pterodactylus.xdcc.core.event.GenericMessage;
 import net.pterodactylus.xdcc.core.event.MessageReceived;
 import net.pterodactylus.xdcc.data.Bot;
 import net.pterodactylus.xdcc.data.Download;
@@ -118,17 +119,17 @@ public class CommandReader extends AbstractExecutionThreadService {
 			} else if (words[0].equalsIgnoreCase("dcc")) {
 				int counter = 0;
 				for (DccReceiver dccReceiver : core.dccReceivers()) {
-					write(String.format("[%d] %s (%s, ", counter++, dccReceiver.filename(), dccReceiver.size()));
+					writer.write(String.format("[%d] %s (%s, ", counter++, dccReceiver.filename(), f(dccReceiver.size())));
 					if (dccReceiver.isRunning()) {
-						write(String.format("%.1f%%, %s", dccReceiver.progress() * 100.0 / dccReceiver.size(), f(dccReceiver.currentRate())));
+						writer.write(String.format("%.1f%%, %s", dccReceiver.progress() * 100.0 / dccReceiver.size(), f(dccReceiver.currentRate())));
 					} else {
 						if (dccReceiver.progress() >= dccReceiver.size()) {
-							write(String.format("complete, %s", f(dccReceiver.overallRate())));
+							writer.write(String.format("complete, %s", f(dccReceiver.overallRate())));
 						} else {
-							write(String.format("aborted at %.1f%%, %s", dccReceiver.progress() * 100.0 / dccReceiver.size(), f(dccReceiver.currentRate())));
+							writer.write(String.format("aborted at %.1f%%, %s", dccReceiver.progress() * 100.0 / dccReceiver.size(), f(dccReceiver.currentRate())));
 						}
 					}
-					write("/s)\n");
+					writer.write("/s)\n");
 				}
 				writeLine("End of DCCs.");
 			} else if (words[0].equalsIgnoreCase("get")) {
@@ -171,7 +172,7 @@ public class CommandReader extends AbstractExecutionThreadService {
 	public void downloadStarted(DownloadStarted downloadStarted) {
 		Download download = downloadStarted.download();
 		try {
-			writeLine(String.format("Download of %s (from %s, %s) has started.", download.filename(), download.bot().name(), download.bot().network().name()));
+			writeLine(String.format("Download of %s (from %s, %s) has started.", download.pack().name(), download.bot().name(), download.bot().network().name()));
 		} catch (IOException ioe1) {
 			/* ignore. */
 		}
@@ -187,7 +188,7 @@ public class CommandReader extends AbstractExecutionThreadService {
 	public void downloadFinished(DownloadFinished downloadFinished) {
 		Download download = downloadFinished.download();
 		try {
-			writeLine(String.format("Download of %s (from %s, %s) has finished, at %s/s.", download.filename(), download.bot().name(), download.bot().network().name(), f(download.dccReceiver().overallRate())));
+			writeLine(String.format("Download of %s (from %s, %s) has finished, at %s/s.", download.pack().name(), download.bot().name(), download.bot().network().name(), f(download.dccReceiver().overallRate())));
 		} catch (IOException ioe1) {
 			/* ignore. */
 		}
@@ -224,23 +225,25 @@ public class CommandReader extends AbstractExecutionThreadService {
 		}
 	}
 
-	//
-	// PRIVATE METHODS
-	//
-
 	/**
-	 * Writes the given text to the {@link #writer}.
+	 * Writes a generic message to the console.
 	 *
-	 * @param text
-	 * 		The text to write
-	 * @throws IOException
-	 * 		if an I/O error occurs
+	 * @param genericMessage
+	 * 		The generic message event
 	 */
-	private void write(String text) throws IOException {
-		writer.write(text);
-		writer.flush();
+	@Subscribe
+	public void genericMessage(GenericMessage genericMessage) {
+		try {
+			writeLine(genericMessage.message());
+		} catch (IOException ioe1) {
+			/* ignore. */
+		}
 	}
 
+	//
+	// PRIVATE METHODS
+	//
+
 	/**
 	 * Writes the given line followed by an LF to the {@link #writer}.
 	 *