Expose the current rate over the maximum lifetime.

[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 e417f83..d253148 100644 (file)
--- a/src/main/java/net/pterodactylus/xdcc/core/Core.java
+++ b/src/main/java/net/pterodactylus/xdcc/core/Core.java
@@ -33,6 +33,7 @@ import java.util.logging.Logger;
 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.ChannelMessageReceived;
 import net.pterodactylus.irc.event.ConnectionEstablished;
 import net.pterodactylus.irc.event.DccSendReceived;
@@ -74,6 +75,12 @@ public class Core extends AbstractIdleService {
        /** The channels that should be monitored. */
        private final Collection<Channel> channels = Sets.newHashSet();
 
+       /** The channels that are currentlymonitored. */
+       private final Collection<Channel> joinedChannels = Sets.newHashSet();
+
+       /** The channels that are joined but not configured. */
+       private final Collection<Channel> extraChannels = Sets.newHashSet();
+
        /** The current network connections. */
        private final Map<Network, Connection> networkConnections = Collections.synchronizedMap(Maps.<Network, Connection>newHashMap());
 
@@ -109,6 +116,24 @@ public class Core extends AbstractIdleService {
        }
 
        /**
+        * Returns all currently joined channels.
+        *
+        * @return All currently joined channels
+        */
+       public Collection<Channel> joinedChannels() {
+               return ImmutableSet.copyOf(joinedChannels);
+       }
+
+       /**
+        * Returns all currently joined channels that are not configured.
+        *
+        * @return All currently joined but not configured channels
+        */
+       public Collection<Channel> extraChannels() {
+               return ImmutableSet.copyOf(extraChannels);
+       }
+
+       /**
         * Returns all currently known bots.
         *
         * @return All currently known bots
@@ -223,6 +248,33 @@ public class Core extends AbstractIdleService {
        }
 
        /**
+        * Shows a message when a channel was joined by us.
+        *
+        * @param channelJoined
+        *              The channel joined event
+        */
+       @Subscribe
+       public void channelJoined(ChannelJoined channelJoined) {
+               if (channelJoined.connection().isSource(channelJoined.client())) {
+                       Optional<Network> network = getNetwork(channelJoined.connection());
+                       if (!network.isPresent()) {
+                               return;
+                       }
+
+                       Optional<Channel> channel = getChannel(network.get(), channelJoined.channel());
+                       if (!channel.isPresent()) {
+                               /* it’s an extra channel. */
+                               extraChannels.add(new Channel(network.get(), channelJoined.channel()));
+                               logger.info(String.format("Joined extra Channel %s on %s.", channelJoined.channel(), network.get().name()));
+                               return;
+                       }
+
+                       joinedChannels.add(channel.get());
+                       logger.info(String.format("Joined Channel %s on %s.", channelJoined.channel(), network.get().name()));
+               }
+       }
+
+       /**
         * If a message on a channel is received, it is parsed for pack information
         * with is then added to a bot.
         *
@@ -307,6 +359,25 @@ public class Core extends AbstractIdleService {
        }
 
        /**
+        * Returns the configured 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 configured channel, or {@link Optional#absent()} if no
+        *         configured channel matching the given network and name was found
+        */
+       public Optional<Channel> getChannel(Network network, String channelName) {
+               for (Channel channel : channels) {
+                       if (channel.network().equals(network) && (channel.name().equals(channelName))) {
+                               return Optional.of(channel);
+                       }
+               }
+               return Optional.absent();
+       }
+
+       /**
         * Parses {@link Pack} information from the given message.
         *
         * @param message