Sort search results by pack and bot name.
[xudocci.git] / src / main / java / net / pterodactylus / xdcc / ui / stdin / CommandReader.java
index 19d5a2b..95425d0 100644 (file)
@@ -21,11 +21,15 @@ 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;
@@ -38,6 +42,7 @@ 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;
@@ -85,6 +90,7 @@ public class CommandReader extends AbstractExecutionThreadService {
                String lastLine = "";
                String line;
                final List<Result> lastResult = Lists.newArrayList();
+               final List<Connection> lastConnections = Lists.newArrayList();
                while ((line = reader.readLine()) != null) {
                        if (line.equals("")) {
                                line = lastLine;
@@ -92,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))) {
@@ -118,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")) {
@@ -152,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;
@@ -172,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. */
                }
@@ -188,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. */
                }
@@ -245,19 +276,6 @@ public class CommandReader extends AbstractExecutionThreadService {
        //
 
        /**
-        * Writes the given text to the {@link #writer}.
-        *
-        * @param text
-        *              The text to write
-        * @throws IOException
-        *              if an I/O error occurs
-        */
-       private void write(String text) throws IOException {
-               writer.write(text);
-               writer.flush();
-       }
-
-       /**
         * Writes the given line followed by an LF to the {@link #writer}.
         *
         * @param line
@@ -294,6 +312,57 @@ public class CommandReader extends AbstractExecutionThreadService {
        /** Container for result information. */
        private static class Result implements Comparable<Result> {
 
+               /** {@link Predicate} that matches {@link Result}s that contain an archive. */
+               private static final Predicate<Result> isArchive = new Predicate<Result>() {
+
+                       /** All suffixes that are recognized as archives. */
+                       private final List<String> 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 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<String> botNameComparator = new Comparator<String>() {
+
+                       /** 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;
 
@@ -341,7 +410,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());
                }
 
        }