From 287af7be5a3fe79882649783649889f079451d27 Mon Sep 17 00:00:00 2001 From: =?utf8?q?David=20=E2=80=98Bombe=E2=80=99=20Roden?= Date: Thu, 18 Apr 2013 06:11:52 +0200 Subject: [PATCH] Show whether a download has already started. --- src/main/java/net/pterodactylus/xdcc/core/Core.java | 8 ++++---- .../java/net/pterodactylus/xdcc/ui/stdin/CommandReader.java | 10 ++++++++-- 2 files changed, 12 insertions(+), 6 deletions(-) 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 dccReceivers() { - return dccReceivers; + public Collection 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 { -- 2.7.4