X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fxdcc%2Fcore%2FCore.java;h=4d1e1ac5aafa2f64c083fd325baa5158631fd5ab;hb=aa82fb99f45b296163464bff96bd130b7e02ce75;hp=df6d27882adef0a90cbdff7790f7e5f40a95c655;hpb=26c31e8604a345042f41d72b9abefd0d7eb8d02d;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 df6d278..4d1e1ac 100644
--- a/src/main/java/net/pterodactylus/xdcc/core/Core.java
+++ b/src/main/java/net/pterodactylus/xdcc/core/Core.java
@@ -34,11 +34,13 @@ import net.pterodactylus.irc.Connection;
 import net.pterodactylus.irc.ConnectionBuilder;
 import net.pterodactylus.irc.DccReceiver;
 import net.pterodactylus.irc.event.ChannelJoined;
+import net.pterodactylus.irc.event.ChannelLeft;
 import net.pterodactylus.irc.event.ChannelMessageReceived;
 import net.pterodactylus.irc.event.ConnectionEstablished;
 import net.pterodactylus.irc.event.DccDownloadFailed;
 import net.pterodactylus.irc.event.DccDownloadFinished;
 import net.pterodactylus.irc.event.DccSendReceived;
+import net.pterodactylus.irc.event.PrivateMessageReceived;
 import net.pterodactylus.irc.util.MessageCleaner;
 import net.pterodactylus.irc.util.RandomNickname;
 import net.pterodactylus.xdcc.core.event.BotAdded;
@@ -46,6 +48,8 @@ import net.pterodactylus.xdcc.core.event.CoreStarted;
 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.Channel;
 import net.pterodactylus.xdcc.data.Download;
@@ -104,7 +108,7 @@ public class Core extends AbstractIdleService {
 	private final Map<String, Download> downloads = Maps.newHashMap();
 
 	/** The current DCC receivers. */
-	private final Collection<DccReceiver> dccReceivers = Sets.newHashSet();
+	private final Collection<DccReceiver> dccReceivers = Lists.newArrayList();
 
 	/**
 	 * Creates a new core.
@@ -300,6 +304,46 @@ public class Core extends AbstractIdleService {
 	}
 
 	/**
+	 * Removes bots that leave a channel, or channels when it’s us that’s leaving.
+	 *
+	 * @param channelLeft
+	 * 		The channel left event
+	 */
+	@Subscribe
+	public void channelLeft(ChannelLeft channelLeft) {
+		Optional<Network> network = getNetwork(channelLeft.connection());
+		if (!network.isPresent()) {
+			return;
+		}
+
+		Bot bot = networkBots.get(network.get(), channelLeft.client().nick().get());
+		if (bot == null) {
+			/* maybe it was us? */
+			if (channelLeft.connection().isSource(channelLeft.client())) {
+				Optional<Channel> channel = getChannel(network.get(), channelLeft.channel());
+				if (!channel.isPresent()) {
+					/* maybe it was an extra channel? */
+					channel = getExtraChannel(network.get(), channelLeft.channel());
+					if (!channel.isPresent()) {
+						/* okay, whatever. */
+						return;
+					}
+
+					extraChannels.remove(channel);
+				} else {
+					channels.remove(channel.get());
+				}
+
+				eventBus.post(new GenericMessage(String.format("Left Channel %s on %s.", channel.get().name(), channel.get().network().name())));
+			}
+
+			return;
+		}
+
+		networkBots.remove(network.get(), channelLeft.client().nick().get());
+	}
+
+	/**
 	 * If a message on a channel is received, it is parsed for pack information
 	 * with is then added to a bot.
 	 *
@@ -343,6 +387,17 @@ public class Core extends AbstractIdleService {
 	}
 
 	/**
+	 * Forward all private messages to every console.
+	 *
+	 * @param privateMessageReceived
+	 * 		The private message recevied event
+	 */
+	@Subscribe
+	public void privateMessageReceived(PrivateMessageReceived privateMessageReceived) {
+		eventBus.post(new MessageReceived(privateMessageReceived.source(), privateMessageReceived.message()));
+	}
+
+	/**
 	 * Starts a DCC download.
 	 *
 	 * @param dccSendReceived
@@ -395,6 +450,8 @@ public class Core extends AbstractIdleService {
 			File file = new File(download.filename());
 			file.renameTo(new File(finalDirectory, download.pack().name()));
 			eventBus.post(new DownloadFinished(download));
+			dccReceivers.remove(dccDownloadFinished.dccReceiver());
+			downloads.remove(download);
 		} catch (IOException ioe1) {
 			/* TODO - handle all the errors. */
 			logger.log(Level.WARNING, String.format("Could not move file %s to directory %s.", download.filename(), finalDirectory), ioe1);
@@ -418,6 +475,8 @@ public class Core extends AbstractIdleService {
 		try {
 			Closeables.close(download.outputStream(), true);
 			eventBus.post(new DownloadFailed(download));
+			dccReceivers.remove(dccDownloadFailed.dccReceiver());
+			downloads.remove(download);
 		} catch (IOException ioe1) {
 			/* swallow silently. */
 		}
@@ -457,7 +516,26 @@ public class Core extends AbstractIdleService {
 	 */
 	public Optional<Channel> getChannel(Network network, String channelName) {
 		for (Channel channel : channels) {
-			if (channel.network().equals(network) && (channel.name().equals(channelName))) {
+			if (channel.network().equals(network) && (channel.name().equalsIgnoreCase(channelName))) {
+				return Optional.of(channel);
+			}
+		}
+		return Optional.absent();
+	}
+
+	/**
+	 * Returns the extra channel for the given network and name.
+	 *
+	 * @param network
+	 * 		The network the channel is located on
+	 * @param channelName
+	 * 		The name of the channel
+	 * @return The extra channel, or {@link Optional#absent()} if no extra channel
+	 *         matching the given network and name was found
+	 */
+	public Optional<Channel> getExtraChannel(Network network, String channelName) {
+		for (Channel channel : extraChannels) {
+			if (channel.network().equals(network) && (channel.name().equalsIgnoreCase(channelName))) {
 				return Optional.of(channel);
 			}
 		}