X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fxdcc%2Fui%2Fstdin%2FCommandReader.java;h=eaaef2389c127b747548799928e681b3b2431710;hb=52be4d6d0bf21502d301814ba88735fd72a3f284;hp=19d5a2b17a6f903e744d7626073ac1efd0f06ca4;hpb=0eeb3fd7d28596456705650c7887b164e235b1da;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 19d5a2b..eaaef23 100644
--- a/src/main/java/net/pterodactylus/xdcc/ui/stdin/CommandReader.java
+++ b/src/main/java/net/pterodactylus/xdcc/ui/stdin/CommandReader.java
@@ -26,6 +26,7 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 
+import net.pterodactylus.irc.Connection;
 import net.pterodactylus.irc.DccReceiver;
 import net.pterodactylus.irc.util.MessageCleaner;
 import net.pterodactylus.xdcc.core.Core;
@@ -85,6 +86,7 @@ public class CommandReader extends AbstractExecutionThreadService {
 		String lastLine = "";
 		String line;
 		final List<Result> lastResult = Lists.newArrayList();
+		final List<Connection> lastConnections = Lists.newArrayList();
 		while ((line = reader.readLine()) != null) {
 			if (line.equals("")) {
 				line = lastLine;
@@ -92,8 +94,8 @@ public class CommandReader extends AbstractExecutionThreadService {
 			String[] words = line.split(" +");
 			if (words[0].equalsIgnoreCase("search")) {
 				lastResult.clear();
-				for (Bot bot : core.bots()) {
-					for (Pack pack : bot) {
+				for (Bot bot : Lists.newArrayList(core.bots())) {
+					for (Pack pack : Lists.newArrayList(bot)) {
 						boolean found = true;
 						for (int wordIndex = 1; wordIndex < words.length; ++wordIndex) {
 							if (words[wordIndex].startsWith("-") && pack.name().toLowerCase().contains(words[wordIndex].toLowerCase().substring(1))) {
@@ -118,18 +120,24 @@ public class CommandReader extends AbstractExecutionThreadService {
 				writeLine("End of Search.");
 			} 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()));
+				for (Download download : core.downloads()) {
+					DccReceiver dccReceiver = download.dccReceiver();
+					if (dccReceiver == null) {
+						/* download has not even started. */
+						writer.write(String.format("[%d] %s requested from %s (not started yet)\n", counter++, download.pack().name(), download.bot().name()));
+						continue;
+					}
+					writer.write(String.format("[%d] %s from %s (%s, ", counter++, dccReceiver.filename(), download.bot().name(), 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")) {
@@ -152,6 +160,25 @@ public class CommandReader extends AbstractExecutionThreadService {
 				}
 
 				writeLine(String.format("%d channels (%d joined, %d extra), %d bots offering %d packs (%d unique).", configuredChannelsCount, joinedChannelsCount, extraChannelsCount, bots.size(), packsCount, packNames.size()));
+			} else if (words[0].equalsIgnoreCase("connections")) {
+				lastConnections.clear();
+				int counter = 0;
+				for (Connection connection : core.connections()) {
+					lastConnections.add(connection);
+					writer.write(String.format("[%d] %s:%d, %s/s\n", counter++, connection.hostname(), connection.port(), f(connection.getInputRate())));
+				}
+				writeLine("End of connections.");
+			} else if (words[0].equalsIgnoreCase("disconnect")) {
+				if ((words.length == 1) || ("all".equals(words[1]))) {
+					for (Connection connection : lastConnections) {
+						core.closeConnection(connection);
+					}
+				} else {
+					Integer index = Ints.tryParse(words[1]);
+					if ((index != null) && (index < lastConnections.size())) {
+						core.closeConnection(lastConnections.get(index));
+					}
+				}
 			}
 
 			lastLine = line;
@@ -172,7 +199,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. */
 		}
@@ -188,7 +215,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. */
 		}
@@ -245,19 +272,6 @@ public class CommandReader extends AbstractExecutionThreadService {
 	//
 
 	/**
-	 * Writes the given text to the {@link #writer}.
-	 *
-	 * @param text
-	 * 		The text to write
-	 * @throws IOException
-	 * 		if an I/O error occurs
-	 */
-	private void write(String text) throws IOException {
-		writer.write(text);
-		writer.flush();
-	}
-
-	/**
 	 * Writes the given line followed by an LF to the {@link #writer}.
 	 *
 	 * @param line