X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fxdcc%2Fui%2Fstdin%2FCommandReader.java;h=c278ea54b9f3c84ab38a430e0092d7402f80b776;hb=4b537b2d4a5b2aec431e0faeb801cc62a741a465;hp=74b365a97a2e7ee11365183027cf9e44524c88f4;hpb=a3fb82f62375a86c959ab6a84995fb142bca7162;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 74b365a..c278ea5 100644 --- a/src/main/java/net/pterodactylus/xdcc/ui/stdin/CommandReader.java +++ b/src/main/java/net/pterodactylus/xdcc/ui/stdin/CommandReader.java @@ -17,27 +17,39 @@ 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 java.io.Writer; +import java.util.Arrays; import java.util.Collection; import java.util.Collections; +import java.util.Comparator; import java.util.List; import java.util.Set; +import java.util.regex.Pattern; +import net.pterodactylus.irc.Connection; import net.pterodactylus.irc.DccReceiver; import net.pterodactylus.irc.util.MessageCleaner; import net.pterodactylus.xdcc.core.Core; import net.pterodactylus.xdcc.core.event.DownloadFailed; import net.pterodactylus.xdcc.core.event.DownloadFinished; import net.pterodactylus.xdcc.core.event.DownloadStarted; +import net.pterodactylus.xdcc.core.event.GenericMessage; import net.pterodactylus.xdcc.core.event.MessageReceived; import net.pterodactylus.xdcc.data.Bot; 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; @@ -84,6 +96,8 @@ public class CommandReader extends AbstractExecutionThreadService { String lastLine = ""; String line; final List lastResult = Lists.newArrayList(); + final List downloads = Lists.newArrayList(); + final List lastConnections = Lists.newArrayList(); while ((line = reader.readLine()) != null) { if (line.equals("")) { line = lastLine; @@ -91,8 +105,8 @@ public class CommandReader extends AbstractExecutionThreadService { String[] words = line.split(" +"); if (words[0].equalsIgnoreCase("search")) { lastResult.clear(); - for (Bot bot : core.bots()) { - for (Pack pack : bot) { + for (Bot bot : Lists.newArrayList(core.bots())) { + for (Pack pack : Lists.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))) { @@ -117,18 +131,26 @@ public class CommandReader extends AbstractExecutionThreadService { writeLine("End of Search."); } else if (words[0].equalsIgnoreCase("dcc")) { int counter = 0; - for (DccReceiver dccReceiver : core.dccReceivers()) { - write(String.format("[%d] %s (%s, ", counter++, dccReceiver.filename(), dccReceiver.size())); + 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 requested from %s (not started yet)\n", counter++, download.pack().name(), download.bot().name())); + continue; + } + writer.write(String.format("[%d] %s from %s (%s, ", counter++, dccReceiver.filename(), download.bot().name(), f(dccReceiver.size()))); if (dccReceiver.isRunning()) { - 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()) { - write(String.format("complete, %s", f(dccReceiver.overallRate()))); + writer.write(String.format("complete, %s/s", f(dccReceiver.overallRate()))); } else { - 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()))); } } - write("/s)\n"); + writer.write(")\n"); } writeLine("End of DCCs."); } else if (words[0].equalsIgnoreCase("get")) { @@ -136,6 +158,11 @@ public class CommandReader extends AbstractExecutionThreadService { 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(); @@ -151,6 +178,25 @@ 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(); + 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."); + } else if (words[0].equalsIgnoreCase("disconnect")) { + if ((words.length == 1) || ("all".equals(words[1]))) { + for (Connection connection : lastConnections) { + core.closeConnection(connection); + } + } else { + Integer index = Ints.tryParse(words[1]); + if ((index != null) && (index < lastConnections.size())) { + core.closeConnection(lastConnections.get(index)); + } + } } lastLine = line; @@ -171,7 +217,7 @@ public class CommandReader extends AbstractExecutionThreadService { public void downloadStarted(DownloadStarted downloadStarted) { Download download = downloadStarted.download(); try { - writeLine(String.format("Download of %s (from %s, %s) has started.", download.filename(), download.bot().name(), download.bot().network().name())); + writeLine(String.format("Download of %s (from %s, %s) has started.", download.pack().name(), download.bot().name(), download.bot().network().name())); } catch (IOException ioe1) { /* ignore. */ } @@ -187,7 +233,7 @@ public class CommandReader extends AbstractExecutionThreadService { public void downloadFinished(DownloadFinished downloadFinished) { Download download = downloadFinished.download(); try { - writeLine(String.format("Download of %s (from %s, %s) has finished, at %s/s.", download.filename(), download.bot().name(), download.bot().network().name(), f(download.dccReceiver().overallRate()))); + writeLine(String.format("Download of %s (from %s, %s) has finished, at %s/s.", download.pack().name(), download.bot().name(), download.bot().network().name(), f(download.dccReceiver().overallRate()))); } catch (IOException ioe1) { /* ignore. */ } @@ -224,23 +270,25 @@ public class CommandReader extends AbstractExecutionThreadService { } } - // - // PRIVATE METHODS - // - /** - * Writes the given text to the {@link #writer}. + * Writes a generic message to the console. * - * @param text - * The text to write - * @throws IOException - * if an I/O error occurs + * @param genericMessage + * The generic message event */ - private void write(String text) throws IOException { - writer.write(text); - writer.flush(); + @Subscribe + public void genericMessage(GenericMessage genericMessage) { + try { + writeLine(genericMessage.message()); + } catch (IOException ioe1) { + /* ignore. */ + } } + // + // PRIVATE METHODS + // + /** * Writes the given line followed by an LF to the {@link #writer}. * @@ -275,9 +323,108 @@ 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 { + /** {@link Predicate} that matches {@link Result}s that contain an archive. */ + private static final Predicate isArchive = new Predicate() { + + /** All suffixes that are recognized as archives. */ + private final List archiveSuffixes = Arrays.asList("rar", "tar", "zip", "tar.gz", "tar.bz2", "tar.lzma", "7z"); + + @Override + public boolean apply(Result result) { + for (String suffix : archiveSuffixes) { + if (result.pack().name().toLowerCase().endsWith(suffix)) { + return true; + } + } + return false; + } + }; + + /** + * {@link Comparator} for {@link Result}s that sorts archives (as per {@link + * #isArchive} to the back of the list. + */ + private static final Comparator packArchiveComparator = new Comparator() { + @Override + public int compare(Result leftResult, Result rightResult) { + if (isArchive.apply(leftResult) && !isArchive.apply(rightResult)) { + return 1; + } + if (!isArchive.apply(leftResult) && isArchive.apply(rightResult)) { + return -1; + } + return 0; + } + }; + + /** + * {@link Comparator} for bot nicknames. It comprises different strategies: + * 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 botNameComparator = new Comparator() { + + /** Regular expression pattern for preferred names. */ + private final Pattern preferredNames = Pattern.compile("(?i)[^\\w]EUR?[^\\w]"); + + /** Regular expression pattern for disliked names. */ + private final Pattern dislikedNames = Pattern.compile("(?i)[^\\w]USA?[^\\w]"); + + @Override + 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 (preferredNames.matcher(rightBotName).find() && !preferredNames.matcher(leftBotName).find()) { + return 1; + } + /* disliked names to the back. */ + if (dislikedNames.matcher(leftBotName).find() && !dislikedNames.matcher(rightBotName).find()) { + return 1; + } + if (dislikedNames.matcher(rightBotName).find() && !dislikedNames.matcher(leftBotName).find()) { + return -1; + } + return 0; + } + }; + + /** + * {@link Comparator} for {@link Result}s that sorts them by the name of the + * {@link Pack}. + */ + private static final Comparator packNameComparator = new Comparator() { + @Override + public int compare(Result leftResult, Result rightResult) { + return leftResult.pack().name().compareToIgnoreCase(rightResult.pack().name()); + } + }; + /** The bot carrying the pack. */ private final Bot bot; @@ -325,7 +472,10 @@ public class CommandReader extends AbstractExecutionThreadService { @Override public int compareTo(Result result) { - return pack().name().compareToIgnoreCase(result.pack().name()); + return ComparisonChain.start() + .compare(this, result, packArchiveComparator) + .compare(this, result, botNameComparator) + .compare(this, result, packNameComparator).result(); } }