X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fxdcc%2Fui%2Fstdin%2FCommandReader.java;h=2a6ec83158338af02b3fc3f0f1e6ae54dd893507;hb=58dbc9b92a90eb17fecaf12d9ef070bce621ebdb;hp=9cd2a12cc4b18d89ae07e6ee0da7cb14ddcfa80f;hpb=2d0f3614a96b0d8f7d5666c65ab80b3cbf5349ec;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 9cd2a12..2a6ec83 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,10 @@ package net.pterodactylus.xdcc.ui.stdin; +import static com.google.common.collect.Lists.newArrayList; +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; @@ -44,7 +48,9 @@ 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; @@ -90,17 +96,16 @@ public class CommandReader extends AbstractExecutionThreadService { protected void run() throws Exception { String lastLine = ""; String line; - final List lastResult = Lists.newArrayList(); - final List lastConnections = Lists.newArrayList(); + State state = new State(); while ((line = reader.readLine()) != null) { if (line.equals("")) { line = lastLine; } String[] words = line.split(" +"); if (words[0].equalsIgnoreCase("search")) { - lastResult.clear(); - for (Bot bot : Lists.newArrayList(core.bots())) { - for (Pack pack : Lists.newArrayList(bot)) { + List lastResult = newArrayList(); + for (Bot bot : newArrayList(core.bots())) { + for (Pack pack : newArrayList(bot)) { boolean found = true; for (int wordIndex = 1; wordIndex < words.length; ++wordIndex) { if (words[wordIndex].startsWith("-") && pack.name().toLowerCase().contains(words[wordIndex].toLowerCase().substring(1))) { @@ -123,9 +128,11 @@ public class CommandReader extends AbstractExecutionThreadService { writeLine(String.format("[%d] %s (%s) from %s (#%s) on %s", counter++, result.pack().name(), result.pack().size(), result.bot().name(), result.pack().id(), result.bot().network().name())); } writeLine("End of Search."); + state = state.setLastResults(lastResult); } else if (words[0].equalsIgnoreCase("dcc")) { int counter = 0; - for (Download download : core.downloads()) { + List downloads = newArrayList(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. */ @@ -134,21 +141,27 @@ 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."); + state = state.setLastDownloads(downloads); } else if (words[0].equalsIgnoreCase("get")) { Integer index = Ints.tryParse(words[1]); - if ((index != null) && (index < lastResult.size())) { - core.fetch(lastResult.get(index).bot(), lastResult.get(index).pack()); + if ((index != null) && (index < state.getLastResults().size())) { + core.fetch(state.getLastResults().get(index).bot(), state.getLastResults().get(index).pack()); + } + } else if (words[0].equalsIgnoreCase("cancel")) { + Integer index = Ints.tryParse(words[1]); + if ((index != null) && (index < state.getLastDownloads().size())) { + core.cancelDownload(state.getLastDownloads().get(index).bot(), state.getLastDownloads().get(index).pack()); } } else if (words[0].equalsIgnoreCase("stats")) { int configuredChannelsCount = core.channels().size(); @@ -166,22 +179,23 @@ public class CommandReader extends AbstractExecutionThreadService { writeLine(String.format("%d channels (%d joined, %d extra), %d bots offering %d packs (%d unique).", configuredChannelsCount, joinedChannelsCount, extraChannelsCount, bots.size(), packsCount, packNames.size())); } else if (words[0].equalsIgnoreCase("connections")) { - lastConnections.clear(); + List lastConnections = newArrayList(); int counter = 0; for (Connection connection : core.connections()) { lastConnections.add(connection); writer.write(String.format("[%d] %s:%d, %s/s\n", counter++, connection.hostname(), connection.port(), f(connection.getInputRate()))); } writeLine("End of connections."); + state = state.setLastConnections(lastConnections); } else if (words[0].equalsIgnoreCase("disconnect")) { if ((words.length == 1) || ("all".equals(words[1]))) { - for (Connection connection : lastConnections) { + for (Connection connection : state.getLastConnections()) { core.closeConnection(connection); } } else { Integer index = Ints.tryParse(words[1]); - if ((index != null) && (index < lastConnections.size())) { - core.closeConnection(lastConnections.get(index)); + if ((index != null) && (index < state.getLastConnections().size())) { + core.closeConnection(state.getLastConnections().get(index)); } } } @@ -310,6 +324,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 { @@ -448,4 +481,114 @@ public class CommandReader extends AbstractExecutionThreadService { } + /** + * Container for the current state of the command reader. + * + * @author David ‘Bombe’ Roden + */ + private static class State { + + /** The last connections displayed. */ + private final List lastConnections; + + /** The last results displayed. */ + private final List lastResults; + + /** The last downloads displayed. */ + private final List lastDownloads; + + /** Creates a new empty state. */ + public State() { + this(Lists.newArrayList(), Lists.newArrayList(), Lists.newArrayList()); + } + + /** + * Creates a new state. + * + * @param lastConnections + * The last connections + * @param lastResults + * The last results + * @param lastDownloads + * The last downloads + */ + private State(List lastConnections, List lastResults, List lastDownloads) { + this.lastConnections = lastConnections; + this.lastResults = lastResults; + this.lastDownloads = lastDownloads; + } + + // + // ACCESSORS + // + + /** + * Returns the last connections displayed. + * + * @return The last connections displayed + */ + public List getLastConnections() { + return lastConnections; + } + + /** + * Returns the last results displayed. + * + * @return The last results displayed + */ + public List getLastResults() { + return lastResults; + } + + /** + * Returns the last downloads displayed. + * + * @return The last downloads displayed + */ + public List getLastDownloads() { + return lastDownloads; + } + + // + // MUTATORS + // + + /** + * Returns a new state with the given last connections and the last downloads + * and results of this state. + * + * @param lastConnections + * The new last connections displayed + * @return The new state + */ + public State setLastConnections(List lastConnections) { + return new State(lastConnections, lastResults, lastDownloads); + } + + /** + * Returns a new state with the given last results and the last downloads and + * connections of this state. + * + * @param lastResults + * The new last results displayed + * @return The new state + */ + public State setLastResults(List lastResults) { + return new State(lastConnections, lastResults, lastDownloads); + } + + /** + * Returns a new state with the given last downloads and the last connections + * and results of this state. + * + * @param lastDownloads + * The new last downloads displayed + * @return The new state + */ + public State setLastDownloads(List lastDownloads) { + return new State(lastConnections, lastResults, lastDownloads); + } + + } + }