X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fxdcc%2Fcore%2FCore.java;h=d89f8079eecbcea11324e6c204e9cd05c897c45f;hb=41e563cfadaff3009c1bad9acf50f8023648b2cd;hp=607246c4d439dc01bf9d59122425714263ac0c6e;hpb=7356600f3a82060f49deb252d3adde1ed3f062fb;p=xudocci.git

diff --git a/src/main/java/net/pterodactylus/xdcc/core/Core.java b/src/main/java/net/pterodactylus/xdcc/core/Core.java
index 607246c..d89f807 100644
--- a/src/main/java/net/pterodactylus/xdcc/core/Core.java
+++ b/src/main/java/net/pterodactylus/xdcc/core/Core.java
@@ -48,8 +48,8 @@ import net.pterodactylus.irc.event.DccDownloadFailed;
 import net.pterodactylus.irc.event.DccDownloadFinished;
 import net.pterodactylus.irc.event.DccSendReceived;
 import net.pterodactylus.irc.event.NicknameChanged;
-import net.pterodactylus.irc.event.PrivateNoticeReceived;
 import net.pterodactylus.irc.event.PrivateMessageReceived;
+import net.pterodactylus.irc.event.PrivateNoticeReceived;
 import net.pterodactylus.irc.util.MessageCleaner;
 import net.pterodactylus.irc.util.RandomNickname;
 import net.pterodactylus.xdcc.core.event.BotAdded;
@@ -220,6 +220,25 @@ public class Core extends AbstractExecutionThreadService {
 			return;
 		}
 
+		/* check if we are already downloading the file? */
+		if (downloads.containsKey(pack.name())) {
+			Collection<Download> packDownloads = downloads.get(pack.name());
+			Collection<Download> runningDownloads = FluentIterable.from(packDownloads).filter(FILTER_RUNNING).toSet();
+			if (!runningDownloads.isEmpty()) {
+				Download download = runningDownloads.iterator().next();
+				eventBus.post(new GenericMessage(String.format("File %s is already downloading from %s (%s).", pack.name(), download.bot().name(), download.bot().network().name())));
+				return;
+			}
+			StringBuilder bots = new StringBuilder();
+			for (Download download : packDownloads) {
+				if (bots.length() > 0) {
+					bots.append(", ");
+				}
+				bots.append(download.bot().name()).append(" (").append(download.bot().network().name()).append(')');
+			}
+			eventBus.post(new GenericMessage(String.format("File %s is already requested from %d bots (%s).", pack.name(), packDownloads.size(), bots.toString())));
+		}
+
 		Download download = new Download(bot, pack);
 		downloads.put(pack.name(), download);
 
@@ -515,7 +534,7 @@ public class Core extends AbstractExecutionThreadService {
 		Bot bot;
 		synchronized (networkBots) {
 			if (!networkBots.contains(network.get(), channelMessageReceived.source().nick().get())) {
-				bot = new Bot(network.get()).name(channelMessageReceived.source().nick().get());
+				bot = new Bot(network.get(), channelMessageReceived.source().nick().get());
 				networkBots.put(network.get(), channelMessageReceived.source().nick().get(), bot);
 				eventBus.post(new BotAdded(bot));
 			} else {
@@ -552,7 +571,7 @@ public class Core extends AbstractExecutionThreadService {
 			return;
 		}
 
-		eventBus.post(new GenericMessage(String.format("Notice from %s (%s): %s", privateNoticeReceived.reply().source(), network.get(), privateNoticeReceived.text())));
+		eventBus.post(new GenericMessage(String.format("Notice from %s (%s): %s", privateNoticeReceived.reply().source().get(), network.get(), privateNoticeReceived.text())));
 	}
 
 	/**