X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fxdcc%2Fui%2Fstdin%2FCommandReader.java;h=26696f9ab3ba2208e6f8ef125bcd4c48d841cd6c;hb=17ab500f0e0e366f509bbdf3891ad2c53ea74d7e;hp=7b6e64fe96d858baea9b04ed1829dae5b7cd6c1f;hpb=2046535620b0b7594034471842086a47342e1f5a;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 7b6e64f..26696f9 100644
--- a/src/main/java/net/pterodactylus/xdcc/ui/stdin/CommandReader.java
+++ b/src/main/java/net/pterodactylus/xdcc/ui/stdin/CommandReader.java
@@ -17,6 +17,9 @@
 
 package net.pterodactylus.xdcc.ui.stdin;
 
+import static net.pterodactylus.xdcc.data.Download.BY_NAME;
+import static net.pterodactylus.xdcc.data.Download.BY_RUNNING;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.Reader;
@@ -43,7 +46,10 @@ import net.pterodactylus.xdcc.data.Download;
 import net.pterodactylus.xdcc.data.Pack;
 
 import com.google.common.base.Predicate;
+import com.google.common.collect.ComparisonChain;
+import com.google.common.collect.FluentIterable;
 import com.google.common.collect.Lists;
+import com.google.common.collect.Ordering;
 import com.google.common.collect.Sets;
 import com.google.common.eventbus.Subscribe;
 import com.google.common.primitives.Ints;
@@ -124,7 +130,7 @@ public class CommandReader extends AbstractExecutionThreadService {
 				writeLine("End of Search.");
 			} else if (words[0].equalsIgnoreCase("dcc")) {
 				int counter = 0;
-				for (Download download : core.downloads()) {
+				for (Download download : FluentIterable.from(core.downloads()).toSortedList(Ordering.from(BY_NAME).compound(BY_RUNNING))) {
 					DccReceiver dccReceiver = download.dccReceiver();
 					if (dccReceiver == null) {
 						/* download has not even started. */
@@ -133,15 +139,15 @@ public class CommandReader extends AbstractExecutionThreadService {
 					}
 					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())));
+						writer.write(String.format("%.1f%%, %s/s, %s", dccReceiver.progress() * 100.0 / dccReceiver.size(), f(dccReceiver.currentRate()), getTimeLeft(dccReceiver)));
 					} else {
 						if (dccReceiver.progress() >= dccReceiver.size()) {
-							writer.write(String.format("complete, %s", f(dccReceiver.overallRate())));
+							writer.write(String.format("complete, %s/s", f(dccReceiver.overallRate())));
 						} else {
-							writer.write(String.format("aborted at %.1f%%, %s", dccReceiver.progress() * 100.0 / dccReceiver.size(), f(dccReceiver.currentRate())));
+							writer.write(String.format("aborted at %.1f%%, %s/s", dccReceiver.progress() * 100.0 / dccReceiver.size(), f(dccReceiver.currentRate())));
 						}
 					}
-					writer.write("/s)\n");
+					writer.write(")\n");
 				}
 				writeLine("End of DCCs.");
 			} else if (words[0].equalsIgnoreCase("get")) {
@@ -309,6 +315,25 @@ public class CommandReader extends AbstractExecutionThreadService {
 		return String.format("%dB", number);
 	}
 
+	/**
+	 * Returns the estimated time left for the given transfer.
+	 *
+	 * @param dccReceiver
+	 * 		The DCC receiver to get the time left for
+	 * @return The time left for the transfer, or “unknown” if the time can not be
+	 *         estimated
+	 */
+	private static String getTimeLeft(DccReceiver dccReceiver) {
+		if ((dccReceiver.size() == -1) || (dccReceiver.currentRate() == 0)) {
+			return "unknown";
+		}
+		long secondsLeft = (dccReceiver.size() - dccReceiver.progress()) / dccReceiver.currentRate();
+		if (secondsLeft > 3600) {
+			return String.format("%02d:%02d:%02d", secondsLeft / 3600, (secondsLeft / 60) % 60, secondsLeft % 60);
+		}
+		return String.format("%02d:%02d", (secondsLeft / 60) % 60, secondsLeft % 60);
+	}
+
 	/** Container for result information. */
 	private static class Result implements Comparable<Result> {
 
@@ -439,14 +464,10 @@ public class CommandReader extends AbstractExecutionThreadService {
 
 		@Override
 		public int compareTo(Result result) {
-			if (isArchive.apply(this) && !isArchive.apply(result)) {
-				return 1;
-			}
-			if (!isArchive.apply(this) && isArchive.apply(result)) {
-				return -1;
-			}
-			/* sort by bot name. */
-			return botNameComparator.compare(bot().name(), result.bot().name());
+			return ComparisonChain.start()
+					.compare(this, result, packArchiveComparator)
+					.compare(this, result, botNameComparator)
+					.compare(this, result, packNameComparator).result();
 		}
 
 	}