X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fxdcc%2Fcore%2FCore.java;h=13e63f22aa3e012fe10972d7c4c9c174b7ec9948;hb=a125bb14b3c30da259d49433b011c000e64f3c0c;hp=8aa31e20884dcdead822fe1389df71ed0fb97cb6;hpb=d49b149690e24825e9a3bc75f9d53094a7b660b4;p=xudocci.git

diff --git a/src/main/java/net/pterodactylus/xdcc/core/Core.java b/src/main/java/net/pterodactylus/xdcc/core/Core.java
index 8aa31e2..13e63f2 100644
--- a/src/main/java/net/pterodactylus/xdcc/core/Core.java
+++ b/src/main/java/net/pterodactylus/xdcc/core/Core.java
@@ -36,11 +36,14 @@ import net.pterodactylus.irc.DccReceiver;
 import net.pterodactylus.irc.event.ChannelJoined;
 import net.pterodactylus.irc.event.ChannelMessageReceived;
 import net.pterodactylus.irc.event.ConnectionEstablished;
+import net.pterodactylus.irc.event.DccDownloadFinished;
 import net.pterodactylus.irc.event.DccSendReceived;
 import net.pterodactylus.irc.util.MessageCleaner;
 import net.pterodactylus.irc.util.RandomNickname;
 import net.pterodactylus.xdcc.core.event.BotAdded;
 import net.pterodactylus.xdcc.core.event.CoreStarted;
+import net.pterodactylus.xdcc.core.event.DownloadFinished;
+import net.pterodactylus.xdcc.core.event.DownloadStarted;
 import net.pterodactylus.xdcc.data.Bot;
 import net.pterodactylus.xdcc.data.Channel;
 import net.pterodactylus.xdcc.data.Download;
@@ -344,18 +347,57 @@ public class Core extends AbstractIdleService {
 	 */
 	@Subscribe
 	public void dccSendReceived(DccSendReceived dccSendReceived) {
+		Optional<Network> network = getNetwork(dccSendReceived.connection());
+		if (!network.isPresent()) {
+			return;
+		}
+
+		Download download = downloads.get(dccSendReceived.filename());
+		if (download == null) {
+			/* unknown download, ignore. */
+			return;
+		}
+
 		logger.info(String.format("Starting download of %s.", dccSendReceived.filename()));
 		try {
 			File outputFile = new File(temporaryDirectory, dccSendReceived.filename());
 			OutputStream fileOutputStream = new FileOutputStream(outputFile);
 			DccReceiver dccReceiver = new DccReceiver(eventBus, dccSendReceived.inetAddress(), dccSendReceived.port(), dccSendReceived.filename(), dccSendReceived.filesize(), fileOutputStream);
+			download.filename(outputFile.getPath()).outputStream(fileOutputStream).dccReceiver(dccReceiver);
 			dccReceivers.add(dccReceiver);
 			dccReceiver.start();
+			eventBus.post(new DownloadStarted(download));
 		} catch (FileNotFoundException fnfe1) {
 			logger.log(Level.WARNING, "Could not open file for download!", fnfe1);
 		}
 	}
 
+	/**
+	 * Closes the output stream of the download and moves the file to the final
+	 * location.
+	 *
+	 * @param dccDownloadFinished
+	 * 		The DCC download finished event
+	 */
+	@Subscribe
+	public void dccDownloadFinished(DccDownloadFinished dccDownloadFinished) {
+		Download download = downloads.get(dccDownloadFinished.dccReceiver().filename());
+		if (download == null) {
+			/* probably shouldn’t happen. */
+			return;
+		}
+
+		try {
+			download.outputStream().close();
+			File file = new File(download.filename());
+			file.renameTo(new File(finalDirectory, download.filename()));
+			eventBus.post(new DownloadFinished(download));
+		} catch (IOException ioe1) {
+			/* TODO - handle all the errors. */
+			logger.log(Level.WARNING, String.format("Could not move file %s to directory %s.", download.filename(), finalDirectory), ioe1);
+		}
+	}
+
 	//
 	// PRIVATE METHODS
 	//