X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Firc%2FConnection.java;h=88059ba2ab8b7ce8a56eca0a688cab278ddacc3e;hb=11a34fab9b919a200c58b17f36a4895d21dd1f16;hp=5b460da54521ce85e3164dd2e48038f73af80d82;hpb=f1762992ce7d64ad321cf95c92796577d0819b80;p=xudocci.git

diff --git a/src/main/java/net/pterodactylus/irc/Connection.java b/src/main/java/net/pterodactylus/irc/Connection.java
index 5b460da..88059ba 100644
--- a/src/main/java/net/pterodactylus/irc/Connection.java
+++ b/src/main/java/net/pterodactylus/irc/Connection.java
@@ -46,10 +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;
@@ -112,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.
 	 *
@@ -136,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.
 	 *
@@ -242,6 +258,24 @@ public class Connection extends AbstractExecutionThreadService implements Servic
 		connectionHandler.sendCommand("PRIVMSG", recipient, message);
 	}
 
+	/**
+	 * Sends a DCC RESUME request to the given recipient.
+	 *
+	 * @param recipient
+	 * 		The recipient of the request
+	 * @param filename
+	 * 		The name of the file to resume
+	 * @param port
+	 * 		The port number from the original DCC SEND request
+	 * @param position
+	 * 		The position at which to resume the transfer
+	 * @throws IOException
+	 * 		if an I/O error occurs
+	 */
+	public void sendDccResume(String recipient, String filename, int port, long position) throws IOException {
+		connectionHandler.sendCommand("PRIVMSG", recipient, String.format("\u0001DCC RESUME %s %d %d\u0001", filename, port, position));
+	}
+
 	//
 	// ABSTRACTEXECUTIONTHREADSERVICE METHODS
 	//
@@ -310,6 +344,14 @@ public class Connection extends AbstractExecutionThreadService implements Servic
 								} else {
 									logger.warning(String.format("Received malformed DCC SEND: “%s”", message));
 								}
+							} else if (messageWords[1].equalsIgnoreCase("ACCEPT")) {
+								Optional<Integer> port = Optional.fromNullable(Ints.tryParse(messageWords[3]));
+								long position = Optional.fromNullable(Longs.tryParse(messageWords[4])).or(-1L);
+								if (port.isPresent()) {
+									eventBus.post(new DccAcceptReceived(this, reply.source().get(), messageWords[2], port.get(), position));
+								} else {
+									logger.warning(String.format("Received malformed DCC ACCEPT: “%s”", message));
+								}
 							}
 						}
 					} else if (!channelTypes.contains(recipient.charAt(0))) {
@@ -372,6 +414,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()));
@@ -391,7 +437,7 @@ public class Connection extends AbstractExecutionThreadService implements Servic
 					eventBus.post(new ChannelNicknames(this, parameters.get(1), nicks));
 					nicks.clear();
 				} else if (command.equalsIgnoreCase("PART")) {
-					eventBus.post(new ChannelLeft(this, parameters.get(0), reply.source().get(), parameters.get(1)));
+					eventBus.post(new ChannelLeft(this, parameters.get(0), reply.source().get(), getOptional(parameters, 1)));
 				} else if (command.equalsIgnoreCase("QUIT")) {
 					eventBus.post(new ClientQuit(this, reply.source().get(), parameters.get(0)));
 
@@ -414,13 +460,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);