X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fxdcc%2Fui%2Fstdin%2FCommandReader.java;h=c362a9b60e8ba96536e8264bb8c76942d1548b2f;hb=12ab30478ba379ed9009a1277ba16d2a2019d52f;hp=497c5fd49281302226b7556569c44e313f616a1e;hpb=aafb2f116a4a53f588e7d912f5f0443e2eae67f3;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 497c5fd..c362a9b 100644
--- a/src/main/java/net/pterodactylus/xdcc/ui/stdin/CommandReader.java
+++ b/src/main/java/net/pterodactylus/xdcc/ui/stdin/CommandReader.java
@@ -18,17 +18,25 @@
 package net.pterodactylus.xdcc.ui.stdin;
 
 import java.io.BufferedReader;
+import java.io.IOException;
 import java.io.Reader;
 import java.io.Writer;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
+import java.util.Set;
 
 import net.pterodactylus.irc.DccReceiver;
 import net.pterodactylus.xdcc.core.Core;
+import net.pterodactylus.xdcc.core.event.DownloadFinished;
+import net.pterodactylus.xdcc.core.event.DownloadStarted;
 import net.pterodactylus.xdcc.data.Bot;
+import net.pterodactylus.xdcc.data.Download;
 import net.pterodactylus.xdcc.data.Pack;
 
 import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
+import com.google.common.eventbus.Subscribe;
 import com.google.common.primitives.Ints;
 import com.google.common.util.concurrent.AbstractExecutionThreadService;
 
@@ -107,7 +115,17 @@ public class CommandReader extends AbstractExecutionThreadService {
 			} else if (words[0].equalsIgnoreCase("dcc")) {
 				int counter = 0;
 				for (DccReceiver dccReceiver : core.dccReceivers()) {
-					writer.write(String.format("[%d] %s (%s, %d%%%s)\n", counter++, dccReceiver.filename(), dccReceiver.size(), dccReceiver.progress() * 100 / dccReceiver.size(), dccReceiver.isRunning() ? "" : ", finished"));
+					writer.write(String.format("[%d] %s (%s, ", counter++, dccReceiver.filename(), dccReceiver.size()));
+					if (dccReceiver.isRunning()) {
+						writer.write(String.format("%.1f%%, %s", dccReceiver.progress() * 100.0 / dccReceiver.size(), f(dccReceiver.currentRate())));
+					} else {
+						if (dccReceiver.progress() >= dccReceiver.size()) {
+							writer.write(String.format("complete, %s", f(dccReceiver.overallRate())));
+						} else {
+							writer.write(String.format("aborted at %.1f%%, %s", dccReceiver.progress() * 100.0 / dccReceiver.size(), f(dccReceiver.currentRate())));
+						}
+					}
+					writer.write("/s)\n");
 				}
 				writer.write("End of DCCs.\n");
 			} else if (words[0].equalsIgnoreCase("get")) {
@@ -115,6 +133,21 @@ public class CommandReader extends AbstractExecutionThreadService {
 				if ((index != null) && (index < lastResult.size())) {
 					core.fetch(lastResult.get(index).bot(), lastResult.get(index).pack());
 				}
+			} else if (words[0].equalsIgnoreCase("stats")) {
+				int configuredChannelsCount = core.channels().size();
+				int joinedChannelsCount = core.joinedChannels().size();
+				int extraChannelsCount = core.extraChannels().size();
+				Collection<Bot> bots = core.bots();
+				Set<String> packNames = Sets.newHashSet();
+				int packsCount = 0;
+				for (Bot bot : bots) {
+					packsCount += bot.packs().size();
+					for (Pack pack : bot) {
+						packNames.add(pack.name());
+					}
+				}
+
+				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()));
 			}
 
 			lastLine = line;
@@ -122,6 +155,69 @@ public class CommandReader extends AbstractExecutionThreadService {
 		}
 	}
 
+	//
+	// EVENT HANDLERS
+	//
+
+	/**
+	 * Called when a download was started.
+	 *
+	 * @param downloadStarted
+	 * 		The download started event
+	 */
+	@Subscribe
+	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();
+		} catch (IOException ioe1) {
+			/* ignore. */
+		}
+	}
+
+	/**
+	 * Called when a download is finished.
+	 *
+	 * @param downloadFinished
+	 * 		The download finished event
+	 */
+	@Subscribe
+	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();
+		} catch (IOException ioe1) {
+			/* ignore. */
+		}
+	}
+
+	//
+	// PRIVATE METHODS
+	//
+
+	/**
+	 * Converts large numbers into a human-friendly format, by showing SI prefixes
+	 * for ×1024 (K), ×1048576 (M), and ×1073741824 (G).
+	 *
+	 * @param number
+	 * 		The number to convert
+	 * @return The converted number
+	 */
+	private static String f(long number) {
+		if (number >= (1 << 30)) {
+			return String.format("%.1fG", number / (double) (1 << 30));
+		}
+		if (number >= (1 << 20)) {
+			return String.format("%.1fM", number / (double) (1 << 20));
+		}
+		if (number >= (1 << 10)) {
+			return String.format("%.1fK", number / (double) (1 << 10));
+		}
+		return String.format("%dB", number);
+	}
+
 	/** Container for result information. */
 	private static class Result implements Comparable<Result> {