From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Thu, 18 Apr 2013 04:11:52 +0000 (+0200)
Subject: Show whether a download has already started.
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=287af7be5a3fe79882649783649889f079451d27;p=xudocci.git

Show whether a download has already started.
---

diff --git a/src/main/java/net/pterodactylus/xdcc/core/Core.java b/src/main/java/net/pterodactylus/xdcc/core/Core.java
index 9d5dcb7..33a22f8 100644
--- a/src/main/java/net/pterodactylus/xdcc/core/Core.java
+++ b/src/main/java/net/pterodactylus/xdcc/core/Core.java
@@ -178,12 +178,12 @@ public class Core extends AbstractExecutionThreadService {
 	}
 
 	/**
-	 * Returns the currently active DCC receivers.
+	 * Returns all currently running downloads.
 	 *
-	 * @return The currently active DCC receivers
+	 * @return All currently running downloads
 	 */
-	public Collection<DccReceiver> dccReceivers() {
-		return dccReceivers;
+	public Collection<Download> downloads() {
+		return downloads.values();
 	}
 
 	//
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 a530a1d..836f406 100644
--- a/src/main/java/net/pterodactylus/xdcc/ui/stdin/CommandReader.java
+++ b/src/main/java/net/pterodactylus/xdcc/ui/stdin/CommandReader.java
@@ -118,8 +118,14 @@ public class CommandReader extends AbstractExecutionThreadService {
 				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(), f(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()) {
 						writer.write(String.format("%.1f%%, %s", dccReceiver.progress() * 100.0 / dccReceiver.size(), f(dccReceiver.currentRate())));
 					} else {