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=b77ac2cc72279b9e3e6f1ab391cb73435437e3dd;hpb=e77221f564760b9870463d84e241c04a65126466;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 b77ac2c..a530a1d 100644
--- a/src/main/java/net/pterodactylus/xdcc/ui/stdin/CommandReader.java
+++ b/src/main/java/net/pterodactylus/xdcc/ui/stdin/CommandReader.java
@@ -27,10 +27,13 @@ import java.util.List;
 import java.util.Set;
 
 import net.pterodactylus.irc.DccReceiver;
+import net.pterodactylus.irc.util.MessageCleaner;
 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;
 import net.pterodactylus.xdcc.data.Pack;
@@ -110,13 +113,13 @@ public class CommandReader extends AbstractExecutionThreadService {
 				Collections.sort(lastResult);
 				int counter = 0;
 				for (Result result : lastResult) {
-					writer.write(String.format("[%d] %s (%s) from %s (#%s) on %s\n", counter++, result.pack().name(), result.pack().size(), result.bot().name(), result.pack().id(), result.bot().network().name()));
+					writeLine(String.format("[%d] %s (%s) from %s (#%s) on %s", counter++, result.pack().name(), result.pack().size(), result.bot().name(), result.pack().id(), result.bot().network().name()));
 				}
-				writer.write("End of Search.\n");
+				writeLine("End of Search.");
 			} else if (words[0].equalsIgnoreCase("dcc")) {
 				int counter = 0;
 				for (DccReceiver dccReceiver : core.dccReceivers()) {
-					writer.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()) {
 						writer.write(String.format("%.1f%%, %s", dccReceiver.progress() * 100.0 / dccReceiver.size(), f(dccReceiver.currentRate())));
 					} else {
@@ -128,7 +131,7 @@ public class CommandReader extends AbstractExecutionThreadService {
 					}
 					writer.write("/s)\n");
 				}
-				writer.write("End of DCCs.\n");
+				writeLine("End of DCCs.");
 			} else if (words[0].equalsIgnoreCase("get")) {
 				Integer index = Ints.tryParse(words[1]);
 				if ((index != null) && (index < lastResult.size())) {
@@ -148,11 +151,10 @@ public class CommandReader extends AbstractExecutionThreadService {
 					}
 				}
 
-				writer.write(String.format("%d channels (%d joined, %d extra), %d bots offering %d packs (%d unique).\n", configuredChannelsCount, joinedChannelsCount, extraChannelsCount, bots.size(), packsCount, packNames.size()));
+				writeLine(String.format("%d channels (%d joined, %d extra), %d bots offering %d packs (%d unique).", configuredChannelsCount, joinedChannelsCount, extraChannelsCount, bots.size(), packsCount, packNames.size()));
 			}
 
 			lastLine = line;
-			writer.flush();
 		}
 	}
 
@@ -170,8 +172,7 @@ public class CommandReader extends AbstractExecutionThreadService {
 	public void downloadStarted(DownloadStarted downloadStarted) {
 		Download download = downloadStarted.download();
 		try {
-			writer.write(String.format("Download of %s (from %s, %s) has started.\n", download.filename(), download.bot().name(), download.bot().network().name()));
-			writer.flush();
+			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,8 +188,7 @@ public class CommandReader extends AbstractExecutionThreadService {
 	public void downloadFinished(DownloadFinished downloadFinished) {
 		Download download = downloadFinished.download();
 		try {
-			writer.write(String.format("Download of %s (from %s, %s) has finished, at %s/s.\n", download.filename(), download.bot().name(), download.bot().network().name(), f(download.dccReceiver().overallRate())));
-			writer.flush();
+			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. */
 		}
@@ -204,8 +204,37 @@ public class CommandReader extends AbstractExecutionThreadService {
 	public void downloadFailed(DownloadFailed downloadFailed) {
 		Download download = downloadFailed.download();
 		try {
-			writer.write(String.format("Download of %s (from %s, %s) has failed at %.1f%% and %s/s.\n", download.filename(), download.bot().name(), download.bot().network().name(), download.dccReceiver().progress() * 100.0 / download.dccReceiver().size(), f(download.dccReceiver().overallRate())));
-			writer.flush();
+			writeLine(String.format("Download of %s (from %s, %s) has failed at %.1f%% and %s/s.", download.filename(), download.bot().name(), download.bot().network().name(), download.dccReceiver().progress() * 100.0 / download.dccReceiver().size(), f(download.dccReceiver().overallRate())));
+		} catch (IOException ioe1) {
+			/* ignore. */
+		}
+	}
+
+	/**
+	 * Displays the received message on the console.
+	 *
+	 * @param messageReceived
+	 * 		The message received event
+	 */
+	@Subscribe
+	public void messageReceived(MessageReceived messageReceived) {
+		try {
+			writeLine(String.format("Message from %s: %s", messageReceived.source(), MessageCleaner.getDefaultInstance().clean(messageReceived.message())));
+		} catch (IOException e) {
+			/* ignore. */
+		}
+	}
+
+	/**
+	 * Writes a generic message to the console.
+	 *
+	 * @param genericMessage
+	 * 		The generic message event
+	 */
+	@Subscribe
+	public void genericMessage(GenericMessage genericMessage) {
+		try {
+			writeLine(genericMessage.message());
 		} catch (IOException ioe1) {
 			/* ignore. */
 		}
@@ -216,6 +245,19 @@ public class CommandReader extends AbstractExecutionThreadService {
 	//
 
 	/**
+	 * Writes the given line followed by an LF to the {@link #writer}.
+	 *
+	 * @param line
+	 * 		The line to write
+	 * @throws IOException
+	 * 		if an I/O error occurs
+	 */
+	private void writeLine(String line) throws IOException {
+		writer.write(line + "\n");
+		writer.flush();
+	}
+
+	/**
 	 * Converts large numbers into a human-friendly format, by showing SI prefixes
 	 * for ×1024 (K), ×1048576 (M), and ×1073741824 (G).
 	 *