import static java.util.Arrays.asList;
import static net.pterodactylus.xdcc.data.Download.BY_NAME;
import static net.pterodactylus.xdcc.data.Download.BY_RUNNING;
+import static net.pterodactylus.xdcc.data.Download.SECONDS_LEFT;
import static net.pterodactylus.xdcc.ui.stdin.CommandReader.f;
+import static net.pterodactylus.xdcc.ui.stdin.CommandReader.t;
import java.io.IOException;
import java.io.Writer;
}
outputWriter.write(String.format("[%d] %s from %s (%s, ", counter++, dccReceiver.filename(), download.bot().name(), f(dccReceiver.size())));
if (dccReceiver.isRunning()) {
- outputWriter.write(String.format("%.1f%%, %s/s, %s", dccReceiver.progress() * 100.0 / dccReceiver.size(), f(dccReceiver.currentRate()), getTimeLeft(dccReceiver)));
+ outputWriter.write(String.format("%.1f%%, %s/s, %s", dccReceiver.progress() * 100.0 / dccReceiver.size(), f(dccReceiver.currentRate()), t(SECONDS_LEFT.apply(download))));
} else {
if (dccReceiver.progress() >= dccReceiver.size()) {
outputWriter.write(String.format("complete, %s/s", f(dccReceiver.overallRate())));
return state.setLastDownloads(downloads);
}
- //
- // PRIVATE METHODS
- //
-
- /**
- * 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);
- }
-
}