X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fxdcc%2Fui%2Fstdin%2FCommandReader.java;h=7b6e64fe96d858baea9b04ed1829dae5b7cd6c1f;hb=2046535620b0b7594034471842086a47342e1f5a;hp=58ef4d09fd93af43299679f954959d843bb479f2;hpb=a3b22ab8e686c5c5b0a609132fb7101e4962ad57;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 58ef4d0..7b6e64f 100644
--- a/src/main/java/net/pterodactylus/xdcc/ui/stdin/CommandReader.java
+++ b/src/main/java/net/pterodactylus/xdcc/ui/stdin/CommandReader.java
@@ -21,10 +21,13 @@ 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;
@@ -39,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;
@@ -94,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))) {
@@ -169,9 +173,15 @@ public class CommandReader extends AbstractExecutionThreadService {
 				}
 				writeLine("End of connections.");
 			} else if (words[0].equalsIgnoreCase("disconnect")) {
-				Integer index = Ints.tryParse(words[1]);
-				if ((index != null) && (index < lastConnections.size())) {
-					core.closeConnection(lastConnections.get(index));
+				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));
+					}
 				}
 			}
 
@@ -302,6 +312,86 @@ 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 {@link Result}s that sorts archives (as per {@link
+		 * #isArchive} to the back of the list.
+		 */
+		private static final Comparator<Result> packArchiveComparator = new Comparator<Result>() {
+			@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<Result> botNameComparator = new Comparator<Result>() {
+
+			/** 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<Result> packNameComparator = new Comparator<Result>() {
+			@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;
 
@@ -349,7 +439,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());
 		}
 
 	}