X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fxdcc%2Fcore%2FCore.java;h=24d9c380cae913c53cc8976b931033f6519a933f;hb=5d31ca8229a8ad96822788015313bf5adada892e;hp=b02398d68c9e6f1bf92aa4ff986e237e3430d16d;hpb=d682d33289abb6bc417da34a0136976c1412bde9;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 b02398d..24d9c38 100644
--- a/src/main/java/net/pterodactylus/xdcc/core/Core.java
+++ b/src/main/java/net/pterodactylus/xdcc/core/Core.java
@@ -17,6 +17,7 @@
 
 package net.pterodactylus.xdcc.core;
 
+import static net.pterodactylus.xdcc.data.Channel.TO_NETWORK;
 import static net.pterodactylus.xdcc.data.Download.FILTER_RUNNING;
 
 import java.io.File;
@@ -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. */
@@ -479,6 +504,7 @@ public class Core extends AbstractExecutionThreadService {
 	 * @param connectionFailed
 	 * 		The connection failed event
 	 */
+	@Subscribe
 	public void connectionFailed(ConnectionFailed connectionFailed) {
 		removeConnection(connectionFailed.connection());
 	}
@@ -547,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());
 	}
 
 	/**
@@ -566,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());
 	}
 
 	/**