X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fxdcc%2Fcore%2FCore.java;h=e2710e4567cc1b8d60dbbeb7bdb8cd9aa50e1819;hb=5a07d92f9e4b871f1e2b8beab56e52ed35d9d44c;hp=2da9c73ec3849b60362b61b65f4346bda5ce36df;hpb=aebda4d27b2079541ca88f92b5a05b67a837d2bc;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 2da9c73..e2710e4 100644
--- a/src/main/java/net/pterodactylus/xdcc/core/Core.java
+++ b/src/main/java/net/pterodactylus/xdcc/core/Core.java
@@ -51,6 +51,7 @@ import net.pterodactylus.irc.event.DccSendReceived;
 import net.pterodactylus.irc.event.NicknameChanged;
 import net.pterodactylus.irc.event.PrivateMessageReceived;
 import net.pterodactylus.irc.event.PrivateNoticeReceived;
+import net.pterodactylus.irc.event.ReplyReceived;
 import net.pterodactylus.irc.util.MessageCleaner;
 import net.pterodactylus.irc.util.RandomNickname;
 import net.pterodactylus.xdcc.core.event.BotAdded;
@@ -260,6 +261,43 @@ public class Core extends AbstractExecutionThreadService {
 	}
 
 	/**
+	 * Cancels the download of the given pack from the given bot.
+	 *
+	 * @param bot
+	 * 		The bot the pack is being downloaded from
+	 * @param pack
+	 * 		The pack being downloaded
+	 */
+	public void cancelDownload(Bot bot, Pack pack) {
+		Optional<Download> download = getDownload(pack, bot);
+		if (!download.isPresent()) {
+			return;
+		}
+
+		/* get connection. */
+		Connection connection = networkConnections.get(bot.network());
+		if (connection == null) {
+			/* request for unknown network? */
+			return;
+		}
+
+		/* remove download. */
+		downloads.remove(pack.name(), download.get());
+
+		/* stop the DCC receiver. */
+		if (download.get().dccReceiver() != null) {
+			download.get().dccReceiver().stop();
+		}
+
+		/* remove the request from the bot, too. */
+		try {
+			connection.sendMessage(bot.name(), String.format("XDCC %s", (download.get().dccReceiver() != null) ? "CANCEL" : "REMOVE"));
+		} catch (IOException ioe1) {
+			logger.log(Level.WARNING, String.format("Could not cancel DCC from %s (%s)!", bot.name(), bot.network().name()), ioe1);
+		}
+	}
+
+	/**
 	 * Closes the given connection.
 	 *
 	 * @param connection
@@ -818,11 +856,38 @@ public class Core extends AbstractExecutionThreadService {
 		}
 	}
 
+	@Subscribe
+	public void replyReceived(ReplyReceived replyReceived) {
+		logger.log(Level.FINEST, String.format("%s: %s", replyReceived.connection().hostname(), replyReceived.reply()));
+	}
+
 	//
 	// PRIVATE METHODS
 	//
 
 	/**
+	 * Returns the download of the given pack from the given bot.
+	 *
+	 * @param pack
+	 * 		The pack being downloaded
+	 * @param bot
+	 * 		The bot the pack is being downloaded from
+	 * @return The download, or {@link Optional#absent()} if the download could not
+	 *         be found
+	 */
+	private Optional<Download> getDownload(Pack pack, Bot bot) {
+		if (!downloads.containsKey(pack.name())) {
+			return Optional.absent();
+		}
+		for (Download download : Lists.newArrayList(downloads.get(pack.name()))) {
+			if (download.bot().equals(bot)) {
+				return Optional.of(download);
+			}
+		}
+		return Optional.absent();
+	}
+
+	/**
 	 * Searches all current connections for the given connection, returning the
 	 * associated network.
 	 *