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

diff --git a/src/main/java/net/pterodactylus/irc/DccReceiver.java b/src/main/java/net/pterodactylus/irc/DccReceiver.java
index a6a55eb..56a3853 100644
--- a/src/main/java/net/pterodactylus/irc/DccReceiver.java
+++ b/src/main/java/net/pterodactylus/irc/DccReceiver.java
@@ -26,9 +26,12 @@ 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;
 import net.pterodactylus.irc.event.DccSendReceived;
 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;
 
@@ -42,6 +45,9 @@ public class DccReceiver extends AbstractExecutionThreadService {
 	/** The logger. */
 	private static final Logger logger = Logger.getLogger(DccReceiver.class.getName());
 
+	/** The event bus. */
+	private final EventBus eventBus;
+
 	/** The address to connect to. */
 	private final InetAddress inetAddress;
 
@@ -78,7 +84,8 @@ public class DccReceiver extends AbstractExecutionThreadService {
 	 * @param outputStream
 	 * 		The output stream to write the file to
 	 */
-	public DccReceiver(InetAddress inetAddress, int port, String filename, long size, OutputStream outputStream) {
+	public DccReceiver(EventBus eventBus, InetAddress inetAddress, int port, String filename, long size, OutputStream outputStream) {
+		this.eventBus = eventBus;
 		this.inetAddress = inetAddress;
 		this.port = port;
 		this.filename = filename;
@@ -125,7 +132,7 @@ public class DccReceiver extends AbstractExecutionThreadService {
 	 *
 	 * @return The current rate of the download, in bytes/second
 	 */
-	public long getCurrentRate() {
+	public long currentRate() {
 		return inputStream.getCurrentRate();
 	}
 
@@ -134,7 +141,7 @@ public class DccReceiver extends AbstractExecutionThreadService {
 	 *
 	 * @return The overall rate of the download, in bytes/second
 	 */
-	public long getOverallRate() {
+	public long overallRate() {
 		return inputStream.getOverallRate();
 	}
 
@@ -160,8 +167,10 @@ public class DccReceiver extends AbstractExecutionThreadService {
 				progress += r;
 			}
 			outputStream.flush();
+			eventBus.post(new DccDownloadFinished(this));
 		} catch (IOException ioe1) {
 			logger.log(Level.WARNING, "I/O error while receiving DCC!", ioe1);
+			eventBus.post(new DccDownloadFailed(this, ioe1));
 		} finally {
 			Closeables.close(inputStream, true);
 			socket.close();