Add method to return all defined networks.

[xudocci.git] / src / main / java / net / pterodactylus / xdcc / core / Core.java

diff --git a/src/main/java/net/pterodactylus/xdcc/core/Core.java b/src/main/java/net/pterodactylus/xdcc/core/Core.java
index e2710e4..b157851 100644 (file)
--- 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;
@@ -158,6 +159,15 @@ 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 configured channels. Due to various circumstances, configured
         * channels might not actually be joined.
         *
@@ -281,12 +291,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. */
@@ -345,7 +355,11 @@ public class Core extends AbstractExecutionThreadService {
                                Connection connection = networkConnections.get(channel.network());
                                if (connection.established()) {
                                        eventBus.post(new GenericMessage(String.format("Trying to join %s on %s.", channel.name(), channel.network().name())));
-                                       connection.joinChannel(channel.name());
+                                       try {
+                                               connection.joinChannel(channel.name());
+                                       } catch (IOException ioe1) {
+                                               eventBus.post(new GenericMessage(String.format("Could not join %s on %s.", channel.name(), channel.network().name())));
+                                       }
                                }
                        }
                }
@@ -439,13 +453,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);
@@ -539,10 +557,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());
        }
 
        /**
@@ -558,10 +573,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());
        }
 
        /**