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;
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;
String lastLine = "";
String line;
final List<Result> lastResult = Lists.newArrayList();
+ final List<Download> downloads = Lists.newArrayList();
final List<Connection> lastConnections = Lists.newArrayList();
while ((line = reader.readLine()) != null) {
if (line.equals("")) {
writeLine("End of Search.");
} else if (words[0].equalsIgnoreCase("dcc")) {
int counter = 0;
- for (Download download : core.downloads()) {
+ downloads.clear();
+ downloads.addAll(FluentIterable.from(core.downloads()).toSortedList(Ordering.from(BY_NAME).compound(BY_RUNNING)));
+ for (Download download : downloads) {
DccReceiver dccReceiver = download.dccReceiver();
if (dccReceiver == null) {
/* download has not even started. */
}
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")) {
if ((index != null) && (index < lastResult.size())) {
core.fetch(lastResult.get(index).bot(), lastResult.get(index).pack());
}
+ } else if (words[0].equalsIgnoreCase("cancel")) {
+ Integer index = Ints.tryParse(words[1]);
+ if ((index != null) && (index < lastResult.size())) {
+ core.cancelDownload(lastResult.get(index).bot(), lastResult.get(index).pack());
+ }
} else if (words[0].equalsIgnoreCase("stats")) {
int configuredChannelsCount = core.channels().size();
int joinedChannelsCount = core.joinedChannels().size();
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> {
* one name pattern is preferred (and thus listed first), one pattern is
* disliked (and thus listed last), the rest is sorted alphabetically.
*/
- private static final Comparator<String> botNameComparator = new Comparator<String>() {
+ private static final Comparator<Result> botNameComparator = new Comparator<Result>() {
/** Regular expression pattern for preferred names. */
private final Pattern preferredNames = Pattern.compile("(?i)[^\\w]EUR?[^\\w]");
private final Pattern dislikedNames = Pattern.compile("(?i)[^\\w]USA?[^\\w]");
@Override
- public int compare(String leftBotName, String rightBotName) {
+ public int compare(Result leftResult, Result rightResult) {
+ String leftBotName = leftResult.bot().name();
+ String rightBotName = rightResult.bot().name();
/* preferred names to the front! */
if (preferredNames.matcher(leftBotName).find() && !preferredNames.matcher(rightBotName).find()) {
return -1;
if (dislikedNames.matcher(rightBotName).find() && !dislikedNames.matcher(leftBotName).find()) {
return -1;
}
- /* rest is sorted by name. */
- return leftBotName.compareToIgnoreCase(rightBotName);
+ return 0;
+ }
+ };
+
+ /**
+ * {@link Comparator} for {@link Result}s that sorts them by the name of the
+ * {@link Pack}.
+ */
+ private static final Comparator<Result> packNameComparator = new Comparator<Result>() {
+ @Override
+ public int compare(Result leftResult, Result rightResult) {
+ return leftResult.pack().name().compareToIgnoreCase(rightResult.pack().name());
}
};
@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();
}
}
projects / xudocci.git / blobdiff