Move connection handling to end of loop.
[xudocci.git] / src / main / java / net / pterodactylus / irc / Connection.java
index 9a2bcd5..58e5365 100644 (file)
@@ -46,11 +46,13 @@ import net.pterodactylus.irc.event.ChannelNotJoined;
 import net.pterodactylus.irc.event.ChannelNotJoined.Reason;
 import net.pterodactylus.irc.event.ChannelTopic;
 import net.pterodactylus.irc.event.ClientQuit;
+import net.pterodactylus.irc.event.ConnectionClosed;
 import net.pterodactylus.irc.event.ConnectionEstablished;
 import net.pterodactylus.irc.event.ConnectionFailed;
 import net.pterodactylus.irc.event.DccAcceptReceived;
 import net.pterodactylus.irc.event.DccSendReceived;
 import net.pterodactylus.irc.event.MotdReceived;
+import net.pterodactylus.irc.event.NicknameChanged;
 import net.pterodactylus.irc.event.NicknameInUseReceived;
 import net.pterodactylus.irc.event.NoNicknameGivenReceived;
 import net.pterodactylus.irc.event.PrivateMessageReceived;
@@ -113,6 +115,9 @@ public class Connection extends AbstractExecutionThreadService implements Servic
        /** The connection handler. */
        private ConnectionHandler connectionHandler;
 
+       /** Whether the connection has already been established. */
+       private boolean established;
+
        /**
         * Creates a new connection.
         *
@@ -137,6 +142,16 @@ public class Connection extends AbstractExecutionThreadService implements Servic
        //
 
        /**
+        * Returns whether this connection has already been established.
+        *
+        * @return {@code true} as long as this connection is established, {@code
+        *         false} otherwise
+        */
+       public boolean established() {
+               return established;
+       }
+
+       /**
         * Returns the nickname that is currently in use by this connection. The
         * nickname is only available once the connection has been {@link #start()}ed.
         *
@@ -345,49 +360,8 @@ public class Connection extends AbstractExecutionThreadService implements Servic
                                                eventBus.post(new ChannelMessageReceived(this, recipient, reply.source().get(), message));
                                        }
 
-                               /* replies 001-004 don’t hold information but they have to be sent on a successful connection. */
-                               } else if (command.equals("001")) {
-                                       connectionStatus |= 0x01;
-                               } else if (command.equals("002")) {
-                                       connectionStatus |= 0x02;
-                               } else if (command.equals("003")) {
-                                       connectionStatus |= 0x04;
-                               } else if (command.equals("004")) {
-                                       connectionStatus |= 0x08;
-
-                               /* 005 originally was a bounce message, now used to transmit useful information about the server. */
-                               } else if (command.equals("005")) {
-                                       for (String parameter : parameters) {
-                                               if (parameter.startsWith("PREFIX=")) {
-                                                       int openParen = parameter.indexOf('(');
-                                                       int closeParen = parameter.indexOf(')');
-                                                       if ((openParen != -1) && (closeParen != -1)) {
-                                                               for (int modeCharacterIndex = 1; modeCharacterIndex < (closeParen - openParen); ++modeCharacterIndex) {
-                                                                       char modeCharacter = parameter.charAt(openParen + modeCharacterIndex);
-                                                                       char modeSymbol = parameter.charAt(closeParen + modeCharacterIndex);
-                                                                       nickPrefixes.put(String.valueOf(modeSymbol), String.valueOf(modeCharacter));
-                                                               }
-                                                               logger.fine(String.format("Parsed Prefixes: %s", nickPrefixes));
-                                                       }
-                                               } else if (parameter.startsWith("CHANTYPES=")) {
-                                                       for (int typeIndex = 10; typeIndex < parameter.length(); ++typeIndex) {
-                                                               channelTypes.add(parameter.charAt(typeIndex));
-                                                       }
-                                                       logger.fine(String.format("Parsed Channel Types: %s", channelTypes));
-                                               }
                                        }
 
-                               /* 375, 372, and 376 handle the server’s MOTD. */
-                               } else if (command.equals("375")) {
-                                       /* MOTD starts. */
-                                       motd.append(parameters.get(1)).append('\n');
-                               } else if (command.equals("372")) {
-                                       motd.append(parameters.get(1)).append('\n');
-                               } else if (command.equals("376")) {
-                                       motd.append(parameters.get(1)).append('\n');
-                                       eventBus.post(new MotdReceived(this, motd.toString()));
-                                       motd.setLength(0);
-
                                /* 43x replies are for nick change errors. */
                                } else if (command.equals("431")) {
                                        eventBus.post(new NoNicknameGivenReceived(this, reply));
@@ -399,6 +373,10 @@ public class Connection extends AbstractExecutionThreadService implements Servic
                                                eventBus.post(new NicknameInUseReceived(this, reply));
                                        }
 
+                               /* client stuff. */
+                               } else if (command.equalsIgnoreCase("NICK")) {
+                                       eventBus.post(new NicknameChanged(this, reply.source().get(), parameters.get(0)));
+
                                /* channel stuff. */
                                } else if (command.equalsIgnoreCase("JOIN")) {
                                        eventBus.post(new ChannelJoined(this, parameters.get(0), reply.source().get()));
@@ -434,6 +412,49 @@ public class Connection extends AbstractExecutionThreadService implements Servic
                                } else if (command.equalsIgnoreCase("PING")) {
                                        connectionHandler.sendCommand("PONG", getOptional(parameters, 0), getOptional(parameters, 1));
 
+                               /* replies 001-004 don’t hold information but they have to be sent on a successful connection. */
+                               } else if (command.equals("001")) {
+                                       connectionStatus |= 0x01;
+                               } else if (command.equals("002")) {
+                                       connectionStatus |= 0x02;
+                               } else if (command.equals("003")) {
+                                       connectionStatus |= 0x04;
+                               } else if (command.equals("004")) {
+                                       connectionStatus |= 0x08;
+
+                               /* 005 originally was a bounce message, now used to transmit useful information about the server. */
+                               } else if (command.equals("005")) {
+                                       for (String parameter : parameters) {
+                                               if (parameter.startsWith("PREFIX=")) {
+                                                       int openParen = parameter.indexOf('(');
+                                                       int closeParen = parameter.indexOf(')');
+                                                       if ((openParen != -1) && (closeParen != -1)) {
+                                                               for (int modeCharacterIndex = 1; modeCharacterIndex < (closeParen - openParen); ++modeCharacterIndex) {
+                                                                       char modeCharacter = parameter.charAt(openParen + modeCharacterIndex);
+                                                                       char modeSymbol = parameter.charAt(closeParen + modeCharacterIndex);
+                                                                       nickPrefixes.put(String.valueOf(modeSymbol), String.valueOf(modeCharacter));
+                                                               }
+                                                               logger.fine(String.format("Parsed Prefixes: %s", nickPrefixes));
+                                                       }
+                                               } else if (parameter.startsWith("CHANTYPES=")) {
+                                                       for (int typeIndex = 10; typeIndex < parameter.length(); ++typeIndex) {
+                                                               channelTypes.add(parameter.charAt(typeIndex));
+                                                       }
+                                                       logger.fine(String.format("Parsed Channel Types: %s", channelTypes));
+                                               }
+                                       }
+
+                               /* 375, 372, and 376 handle the server’s MOTD. */
+                               } else if (command.equals("375")) {
+                                       /* MOTD starts. */
+                                       motd.append(parameters.get(1)).append('\n');
+                               } else if (command.equals("372")) {
+                                       motd.append(parameters.get(1)).append('\n');
+                               } else if (command.equals("376")) {
+                                       motd.append(parameters.get(1)).append('\n');
+                                       eventBus.post(new MotdReceived(this, motd.toString()));
+                                       motd.setLength(0);
+
                                /* okay, everything else. */
                                } else {
                                        eventBus.post(new UnknownReplyReceived(this, reply));
@@ -441,13 +462,17 @@ public class Connection extends AbstractExecutionThreadService implements Servic
 
                                if ((connectionStatus == 0x0f) && (connectionStatus != oldConnectionStatus)) {
                                        /* connection succeeded! */
+                                       established = true;
                                        eventBus.post(new ConnectionEstablished(this));
                                }
                                oldConnectionStatus = connectionStatus;
                        }
+                       eventBus.post(new ConnectionClosed(this));
                } catch (IOException ioe1) {
                        logger.log(Level.WARNING, "I/O error", ioe1);
+                       eventBus.post(new ConnectionClosed(this, ioe1));
                } finally {
+                       established = false;
                        logger.info("Closing Connection.");
                        try {
                                Closeables.close(connectionHandler, true);