X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fxdcc%2Fui%2Fstdin%2FCommandReader.java;h=abef80e5c57b502a28c785927e6439a5349218fc;hb=55c7c1e4b98b06091b5053af4a9157e4a3428b32;hp=29c77ec46cd1557e802608469f0e5cf8dba23c46;hpb=a7b3c0d8ee2b70d26df87666d0a10dbc7822da35;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 29c77ec..abef80e 100644 --- a/src/main/java/net/pterodactylus/xdcc/ui/stdin/CommandReader.java +++ b/src/main/java/net/pterodactylus/xdcc/ui/stdin/CommandReader.java @@ -21,20 +21,28 @@ 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.Lists; import com.google.common.collect.Sets; import com.google.common.eventbus.Subscribe; @@ -82,6 +90,7 @@ public class CommandReader extends AbstractExecutionThreadService { String lastLine = ""; String line; final List lastResult = Lists.newArrayList(); + final List lastConnections = Lists.newArrayList(); while ((line = reader.readLine()) != null) { if (line.equals("")) { line = lastLine; @@ -89,8 +98,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))) { @@ -115,18 +124,24 @@ 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())); + for (Download download : core.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", dccReceiver.progress() * 100.0 / dccReceiver.size(), f(dccReceiver.currentRate()))); } else { if (dccReceiver.progress() >= dccReceiver.size()) { - write(String.format("complete, %s", f(dccReceiver.overallRate()))); + writer.write(String.format("complete, %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", dccReceiver.progress() * 100.0 / dccReceiver.size(), f(dccReceiver.currentRate()))); } } - write("/s)\n"); + writer.write("/s)\n"); } writeLine("End of DCCs."); } else if (words[0].equalsIgnoreCase("get")) { @@ -149,6 +164,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; @@ -169,7 +203,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. */ } @@ -185,7 +219,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. */ } @@ -207,23 +241,40 @@ public class CommandReader extends AbstractExecutionThreadService { } } - // - // PRIVATE METHODS - // + /** + * Displays the received message on the console. + * + * @param messageReceived + * The message received event + */ + @Subscribe + public void messageReceived(MessageReceived messageReceived) { + try { + writeLine(String.format("Message from %s: %s", messageReceived.source(), MessageCleaner.getDefaultInstance().clean(messageReceived.message()))); + } catch (IOException e) { + /* ignore. */ + } + } /** - * 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}. * @@ -261,6 +312,74 @@ public class CommandReader extends AbstractExecutionThreadService { /** 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(String leftBotName, String rightBotName) { + /* 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; + } + /* rest is sorted by name. */ + return leftBotName.compareToIgnoreCase(rightBotName); + } + }; + /** The bot carrying the pack. */ private final Bot bot; @@ -308,7 +427,14 @@ public class CommandReader extends AbstractExecutionThreadService { @Override public int compareTo(Result result) { - return pack().name().compareToIgnoreCase(result.pack().name()); + 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()); } }