X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fxdcc%2Fui%2Fstdin%2FCommandReader.java;h=8696380fd68d3f1dd7b70768f54f18ac8bac45d4;hb=f63869cc3b8dbe14f15def799d6fd4c997259d31;hp=59cdea86ce496e206a9b5a5400d8651c18758425;hpb=1bcf6002a380a9e84970231dbf3f1f1d10db446a;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 59cdea8..8696380 100644
--- a/src/main/java/net/pterodactylus/xdcc/ui/stdin/CommandReader.java
+++ b/src/main/java/net/pterodactylus/xdcc/ui/stdin/CommandReader.java
@@ -19,14 +19,20 @@ package net.pterodactylus.xdcc.ui.stdin;
 
 import java.io.BufferedReader;
 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.data.Bot;
 import net.pterodactylus.xdcc.data.Pack;
 
 import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
+import com.google.common.primitives.Ints;
 import com.google.common.util.concurrent.AbstractExecutionThreadService;
 
 /**
@@ -42,6 +48,9 @@ public class CommandReader extends AbstractExecutionThreadService {
 	/** The reader to read commands from. */
 	private final BufferedReader reader;
 
+	/** The writer to write the results to. */
+	private final Writer writer;
+
 	/**
 	 * Creates a new command reader.
 	 *
@@ -49,10 +58,13 @@ public class CommandReader extends AbstractExecutionThreadService {
 	 * 		The core being controlled
 	 * @param reader
 	 * 		The reader to read commands from
+	 * @param writer
+	 * 		The write to write results to
 	 */
-	public CommandReader(Core core, Reader reader) {
+	public CommandReader(Core core, Reader reader, Writer writer) {
 		this.core = core;
 		this.reader = new BufferedReader(reader);
+		this.writer = writer;
 	}
 
 	//
@@ -92,13 +104,75 @@ public class CommandReader extends AbstractExecutionThreadService {
 				Collections.sort(lastResult);
 				int counter = 0;
 				for (Result result : lastResult) {
-					System.out.println(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(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()));
+				}
+				writer.write("End of Search.\n");
+			} 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()));
+					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")) {
+				Integer index = Ints.tryParse(words[1]);
+				if ((index != null) && (index < lastResult.size())) {
+					core.fetch(lastResult.get(index).bot(), lastResult.get(index).pack());
 				}
-				System.out.println("End of Search.");
+			} 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;
+			writer.flush();
+		}
+	}
+
+	//
+	// 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. */