X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Firc%2FDccReceiver.java;h=e024d4e68cad4cfd635c34e3d53f7836996d9181;hb=f724f1d4c327876f6a296a976b58e413c1eaaed6;hp=56a3853da7aa3b4913ba44599fef2ee9b030eb2b;hpb=907f0d44b3905788e3984f4d19d79a444eafe9f2;p=xudocci.git

diff --git a/src/main/java/net/pterodactylus/irc/DccReceiver.java b/src/main/java/net/pterodactylus/irc/DccReceiver.java
index 56a3853..e024d4e 100644
--- a/src/main/java/net/pterodactylus/irc/DccReceiver.java
+++ b/src/main/java/net/pterodactylus/irc/DccReceiver.java
@@ -23,8 +23,6 @@ import java.io.OutputStream;
 import java.net.InetAddress;
 import java.net.Socket;
 import java.util.concurrent.TimeUnit;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 import net.pterodactylus.irc.event.DccDownloadFailed;
 import net.pterodactylus.irc.event.DccDownloadFinished;
@@ -34,6 +32,7 @@ import net.pterodactylus.xdcc.util.io.BandwidthCountingInputStream;
 import com.google.common.eventbus.EventBus;
 import com.google.common.io.Closeables;
 import com.google.common.util.concurrent.AbstractExecutionThreadService;
+import org.apache.log4j.Logger;
 
 /**
  * Service that receives a file offered by a {@link DccSendReceived}.
@@ -85,10 +84,32 @@ public class DccReceiver extends AbstractExecutionThreadService {
 	 * 		The output stream to write the file to
 	 */
 	public DccReceiver(EventBus eventBus, InetAddress inetAddress, int port, String filename, long size, OutputStream outputStream) {
+		this(eventBus, inetAddress, port, filename, 0, size, outputStream);
+	}
+
+	/**
+	 * Creates a new DCC receiver.
+	 *
+	 * @param inetAddress
+	 * 		The address to connect to
+	 * @param port
+	 * 		The port number to connect to
+	 * @param filename
+	 * 		The name of the file being downloaded
+	 * @param startOffset
+	 * 		The offset at which the download starts in case of a resume
+	 * @param size
+	 * 		The size of the file being downloaded, or {@code -1} if the size is not
+	 * 		known
+	 * @param outputStream
+	 * 		The output stream to write the file to
+	 */
+	public DccReceiver(EventBus eventBus, InetAddress inetAddress, int port, String filename, long startOffset, long size, OutputStream outputStream) {
 		this.eventBus = eventBus;
 		this.inetAddress = inetAddress;
 		this.port = port;
 		this.filename = filename;
+		this.progress = startOffset;
 		this.size = size;
 		this.outputStream = outputStream;
 	}
@@ -133,7 +154,7 @@ public class DccReceiver extends AbstractExecutionThreadService {
 	 * @return The current rate of the download, in bytes/second
 	 */
 	public long currentRate() {
-		return inputStream.getCurrentRate();
+		return (inputStream != null) ? inputStream.getCurrentRate() : 0;
 	}
 
 	/**
@@ -142,7 +163,7 @@ public class DccReceiver extends AbstractExecutionThreadService {
 	 * @return The overall rate of the download, in bytes/second
 	 */
 	public long overallRate() {
-		return inputStream.getOverallRate();
+		return (inputStream != null) ? inputStream.getOverallRate() : 0;
 	}
 
 	//
@@ -154,6 +175,7 @@ public class DccReceiver extends AbstractExecutionThreadService {
 		Socket socket = null;
 		try {
 			socket = new Socket(inetAddress, port);
+			socket.setSoTimeout((int) TimeUnit.MINUTES.toMillis(3));
 			InputStream socketInputStream = socket.getInputStream();
 			inputStream = new BandwidthCountingInputStream(socketInputStream, 5, TimeUnit.SECONDS);
 			byte[] buffer = new byte[65536];
@@ -167,13 +189,19 @@ public class DccReceiver extends AbstractExecutionThreadService {
 				progress += r;
 			}
 			outputStream.flush();
-			eventBus.post(new DccDownloadFinished(this));
+			if ((size == -1) || (progress == size)) {
+				eventBus.post(new DccDownloadFinished(this));
+			} else {
+				eventBus.post(new DccDownloadFailed(this, new IOException("Download aborted.")));
+			}
 		} catch (IOException ioe1) {
-			logger.log(Level.WARNING, "I/O error while receiving DCC!", ioe1);
+			logger.warn("I/O error while receiving DCC!", ioe1);
 			eventBus.post(new DccDownloadFailed(this, ioe1));
 		} finally {
 			Closeables.close(inputStream, true);
-			socket.close();
+			if (socket != null) {
+				socket.close();
+			}
 		}
 	}