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 : FluentIterable.from(core.downloads()).toSortedList(Ordering.from(BY_NAME).compound(BY_RUNNING))) {
+ 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 < downloads.size())) {
+ core.cancelDownload(downloads.get(index).bot(), downloads.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> {