Use a connection factory instead of a connection builder.

[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 c0a2288..ab9804a 100644 (file)
--- a/src/main/java/net/pterodactylus/xdcc/core/Core.java
+++ b/src/main/java/net/pterodactylus/xdcc/core/Core.java
@@ -18,8 +18,6 @@
 package net.pterodactylus.xdcc.core;
 
 import static java.lang.String.format;
-import static java.lang.System.currentTimeMillis;
-import static java.util.concurrent.TimeUnit.HOURS;
 import static net.pterodactylus.irc.event.ChannelNotJoined.Reason.banned;
 import static net.pterodactylus.irc.event.ChannelNotJoined.Reason.registeredNicknamesOnly;
 import static net.pterodactylus.irc.util.MessageCleaner.getDefaultInstance;
@@ -38,9 +36,10 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 
 import net.pterodactylus.irc.Connection;
-import net.pterodactylus.irc.ConnectionBuilder;
+import net.pterodactylus.irc.ConnectionFactory;
 import net.pterodactylus.irc.DccReceiver;
 import net.pterodactylus.irc.event.ChannelJoined;
 import net.pterodactylus.irc.event.ChannelLeft;
@@ -70,12 +69,12 @@ 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.ConnectedNetwork;
 import net.pterodactylus.xdcc.data.Download;
 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;
@@ -107,6 +106,7 @@ public class Core extends AbstractExecutionThreadService {
 
        /** The event bus. */
        private final EventBus eventBus;
+       private final ConnectionFactory connectionFactory;
        private final ChannelBanManager channelBanManager =
                        new ChannelBanManager();
 
@@ -148,8 +148,9 @@ public class Core extends AbstractExecutionThreadService {
         *              The directory to move finished files to
         */
        @Inject
-       public Core(EventBus eventBus, String temporaryDirectory, String finalDirectory) {
+       public Core(EventBus eventBus, ConnectionFactory connectionFactory, String temporaryDirectory, String finalDirectory) {
                this.eventBus = eventBus;
+               this.connectionFactory = connectionFactory;
                this.temporaryDirectory = temporaryDirectory;
                this.finalDirectory = finalDirectory;
        }
@@ -181,13 +182,25 @@ public class Core extends AbstractExecutionThreadService {
         *
         * @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);
-                       }
-               })));
+       public Collection<ConnectedNetwork> connectedNetworks() {
+               return networkConnections.entrySet().stream().map((entry) -> {
+                       Network network = entry.getKey();
+                       Collection<Bot> bots = networkBots.row(network).values();
+                       int packCount = bots.stream().mapToInt((bot) -> bot.packs().size()).reduce((a, b) -> a + b).orElse(0);
+                       return new ConnectedNetwork(network, entry.getValue().hostname(),
+                                       entry.getValue().port(), entry.getValue().nickname(),
+                                       channels.stream()
+                                                       .filter((channel) -> channel.network()
+                                                                       .equals(network))
+                                                       .map(Channel::name)
+                                                       .collect(Collectors.<String>toList()),
+                                       extraChannels.stream()
+                                                       .filter((channel) -> channel.network()
+                                                                       .equals(network))
+                                                       .map(Channel::name)
+                                                       .collect(Collectors.<String>toList()),
+                                       bots.size(), packCount);
+               }).collect(Collectors.<ConnectedNetwork>toList());
        }
 
        /**
@@ -417,7 +430,7 @@ public class Core extends AbstractExecutionThreadService {
                                return;
                        }
                        Server server = servers.get((int) (Math.random() * servers.size()));
-                       Connection connection = new ConnectionBuilder(eventBus).connect(server.hostname()).port(server.unencryptedPorts().iterator().next()).build();
+                       Connection connection = connectionFactory.createConnection(server.hostname(), server.unencryptedPorts().iterator().next());
                        connection.username(RandomNickname.get()).realName(RandomNickname.get());
                        networkConnections.put(network, connection);
                        connection.start();
@@ -566,6 +579,16 @@ public class Core extends AbstractExecutionThreadService {
                        return;
                }
 
+               /* remove all bots for this channel, we might have been kicked. */
+               Collection<Bot> botsToRemove = networkBots.row(network.get())
+                               .values().stream()
+                               .filter(bot -> bot.channel()
+                                               .equalsIgnoreCase(channel.get().name()))
+                               .collect(Collectors.toSet());
+               botsToRemove.stream()
+                               .forEach(bot -> networkBots.row(network.get())
+                                               .remove(bot.name()));
+
                if (channelNotJoined.reason() == registeredNicknamesOnly) {
                        channels.remove(channel.get());
                        eventBus.post(new GenericMessage(
@@ -575,7 +598,7 @@ public class Core extends AbstractExecutionThreadService {
                if (channelNotJoined.reason() == banned) {
                        channelBanManager.ban(channel.get());
                        eventBus.post(new GenericMessage(
-                                       format("Banned from %s, suspending join for  day.",
+                                       format("Banned from %s, suspending join for a day.",
                                                        channel.get())));
                        return;
                }
@@ -728,7 +751,8 @@ public class Core extends AbstractExecutionThreadService {
                Bot bot;
                synchronized (networkBots) {
                        if (!networkBots.contains(network.get(), channelMessageReceived.source().nick().get())) {
-                               bot = new Bot(network.get(), channelMessageReceived.source().nick().get());
+                               bot = new Bot(network.get(), channelMessageReceived.channel(),
+                                               channelMessageReceived.source().nick().get());
                                networkBots.put(network.get(), channelMessageReceived.source().nick().get(), bot);
                                eventBus.post(new BotAdded(bot));
                        } else {