X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fxdcc%2Fcore%2FCore.java;h=d875a5b21d2f0cb5ef38db28b10a37a203b7fea3;hb=0c607fe61d662a15fb9b6368a7f32b92a694096a;hp=240beb1eb4bd301a775d17a1b169e5889dada59c;hpb=a94f83c63a742aad3deeeb110032b3a3efc9da58;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 240beb1..d875a5b 100644
--- a/src/main/java/net/pterodactylus/xdcc/core/Core.java
+++ b/src/main/java/net/pterodactylus/xdcc/core/Core.java
@@ -17,6 +17,8 @@
 
 package net.pterodactylus.xdcc.core;
 
+import static net.pterodactylus.irc.util.MessageCleaner.getDefaultInstance;
+import static net.pterodactylus.xdcc.data.Channel.TO_NETWORK;
 import static net.pterodactylus.xdcc.data.Download.FILTER_RUNNING;
 
 import java.io.File;
@@ -52,7 +54,6 @@ 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;
 import net.pterodactylus.xdcc.core.event.CoreStarted;
@@ -69,6 +70,7 @@ import net.pterodactylus.xdcc.data.Network;
 import net.pterodactylus.xdcc.data.Pack;
 import net.pterodactylus.xdcc.data.Server;
 
+import com.google.common.base.Function;
 import com.google.common.base.Optional;
 import com.google.common.base.Predicate;
 import com.google.common.collect.FluentIterable;
@@ -158,6 +160,29 @@ public class Core extends AbstractExecutionThreadService {
 	}
 
 	/**
+	 * Returns all defined networks.
+	 *
+	 * @return All defined networks
+	 */
+	public Collection<Network> networks() {
+		return FluentIterable.from(channels).transform(TO_NETWORK).toSet();
+	}
+
+	/**
+	 * Returns all connected networks.
+	 *
+	 * @return All connected networks
+	 */
+	public Collection<Network> connectedNetworks() {
+		return Lists.newArrayList(Optional.presentInstances(FluentIterable.from(networkConnections.values()).transform(new Function<Connection, Optional<Network>>() {
+			@Override
+			public Optional<Network> apply(Connection connection) {
+				return getNetwork(connection);
+			}
+		})));
+	}
+
+	/**
 	 * Returns all configured channels. Due to various circumstances, configured
 	 * channels might not actually be joined.
 	 *
@@ -281,12 +306,12 @@ public class Core extends AbstractExecutionThreadService {
 			return;
 		}
 
-		/* remove download. */
-		downloads.remove(pack.name(), download.get());
-
 		/* stop the DCC receiver. */
 		if (download.get().dccReceiver() != null) {
 			download.get().dccReceiver().stop();
+		} else {
+			/* remove download if it hasn’t started yet. */
+			downloads.remove(pack.name(), download.get());
 		}
 
 		/* remove the request from the bot, too. */
@@ -443,13 +468,17 @@ public class Core extends AbstractExecutionThreadService {
 
 		/* found network? */
 		if (!network.isPresent()) {
+			eventBus.post(new GenericMessage(String.format("Connected to unknown network: %s", connectionEstablished.connection().hostname())));
 			return;
 		}
 
+		eventBus.post(new GenericMessage(String.format("Connected to network %s.", network.get().name())));
+
 		/* join all channels on this network. */
 		for (Channel channel : channels) {
 			if (channel.network().equals(network.get())) {
 				try {
+					eventBus.post(new GenericMessage(String.format("Trying to join %s on %s...", channel.name(), network.get().name())));
 					connectionEstablished.connection().joinChannel(channel.name());
 				} catch (IOException ioe1) {
 					logger.log(Level.WARNING, String.format("Could not join %s on %s!", channel.name(), network.get().name()), ioe1);
@@ -475,6 +504,7 @@ public class Core extends AbstractExecutionThreadService {
 	 * @param connectionFailed
 	 * 		The connection failed event
 	 */
+	@Subscribe
 	public void connectionFailed(ConnectionFailed connectionFailed) {
 		removeConnection(connectionFailed.connection());
 	}
@@ -543,10 +573,7 @@ public class Core extends AbstractExecutionThreadService {
 			return;
 		}
 
-		Bot removedBot = networkBots.remove(network.get(), channelLeft.client().nick().get());
-		if (removedBot != null) {
-			eventBus.post(new GenericMessage(String.format("Bot %s (%s) was removed, %d packs removed.", removedBot.name(), removedBot.network().name(), removedBot.packs().size())));
-		}
+		networkBots.remove(network.get(), channelLeft.client().nick().get());
 	}
 
 	/**
@@ -562,10 +589,7 @@ public class Core extends AbstractExecutionThreadService {
 			return;
 		}
 
-		Bot removedBot = networkBots.remove(network.get(), clientQuit.client().nick().get());
-		if (removedBot != null) {
-			eventBus.post(new GenericMessage(String.format("Bot %s (%s) was removed, %d packs removed.", removedBot.name(), removedBot.network().name(), removedBot.packs().size())));
-		}
+		networkBots.remove(network.get(), clientQuit.client().nick().get());
 	}
 
 	/**
@@ -599,7 +623,7 @@ public class Core extends AbstractExecutionThreadService {
 	 */
 	@Subscribe
 	public void channelMessageReceived(ChannelMessageReceived channelMessageReceived) {
-		String message = MessageCleaner.getDefaultInstance().clean(channelMessageReceived.message());
+		String message = getDefaultInstance().clean(channelMessageReceived.message());
 		if (!message.startsWith("#")) {
 			/* most probably not a pack announcement. */
 			return;