From: David ‘Bombe’ Roden Date: Sat, 13 Apr 2013 10:30:36 +0000 (+0200) Subject: Handle DCC resume functionality. X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=947541297c6c02af6047877e0eacd56f03dd3604;p=xudocci.git Handle DCC resume functionality. --- diff --git a/src/main/java/net/pterodactylus/irc/Connection.java b/src/main/java/net/pterodactylus/irc/Connection.java index 6d21b32..9a2bcd5 100644 --- a/src/main/java/net/pterodactylus/irc/Connection.java +++ b/src/main/java/net/pterodactylus/irc/Connection.java @@ -48,6 +48,7 @@ import net.pterodactylus.irc.event.ChannelTopic; import net.pterodactylus.irc.event.ClientQuit; 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.NicknameInUseReceived; @@ -242,6 +243,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 +329,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 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))) { diff --git a/src/main/java/net/pterodactylus/irc/event/DccAcceptReceived.java b/src/main/java/net/pterodactylus/irc/event/DccAcceptReceived.java new file mode 100644 index 0000000..ea63ffa --- /dev/null +++ b/src/main/java/net/pterodactylus/irc/event/DccAcceptReceived.java @@ -0,0 +1,106 @@ +/* + * XdccDownloader - DccSendReceived.java - Copyright © 2013 David Roden + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package net.pterodactylus.irc.event; + +import net.pterodactylus.irc.Connection; +import net.pterodactylus.irc.Source; + +/** + * Notifies a listener that a DCC ACCEPT message was received. A DCC ACCEPT is a + * response to a {@link Connection#sendDccResume(String, String, int, long) DCC + * RESUME} request. + * + * @author David ‘Bombe’ Roden + */ +public class DccAcceptReceived extends AbstractConnectionEvent { + + /** The source of the DCC SEND. */ + private final Source source; + + /** The name of the file being offered. */ + private final String filename; + + /** The port number of the source. */ + private final int port; + + /** The position at which the download will start. */ + private final long position; + + /** + * Creates a new DCC ACCEPT received event. + * + * @param connection + * The connetion the event occured on + * @param source + * The source offering the file + * @param filename + * The name of the file being offered + * @param port + * The port number of the source + * @param position + * The size of the file being offered ({@code -1} for unknown size) + */ + public DccAcceptReceived(Connection connection, Source source, String filename, int port, long position) { + super(connection); + this.source = source; + this.filename = filename; + this.port = port; + this.position = position; + } + + // + // ACCESSORS + // + + /** + * Returns the source offering the file. + * + * @return The source offering the file + */ + public Source source() { + return source; + } + + /** + * Returns the name of the file being offered. + * + * @return The name of the file being offered + */ + public String filename() { + return filename; + } + + /** + * Returns the position at which the download will start. + * + * @return The position at which the download will start + */ + public long position() { + return position; + } + + /** + * Returns the port number of the source. + * + * @return The port number of the source + */ + public int port() { + return port; + } + +}