From: David ‘Bombe’ Roden Date: Thu, 11 Apr 2013 06:19:07 +0000 (+0200) Subject: Notify the user when a download starts or finishes. X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=e8e1597814a95695869af407730c6307ab50d4ed;p=xudocci.git Notify the user when a download starts or finishes. --- diff --git a/src/main/java/net/pterodactylus/xdcc/ui/stdin/CommandReader.java b/src/main/java/net/pterodactylus/xdcc/ui/stdin/CommandReader.java index 8696380..87b9e49 100644 --- a/src/main/java/net/pterodactylus/xdcc/ui/stdin/CommandReader.java +++ b/src/main/java/net/pterodactylus/xdcc/ui/stdin/CommandReader.java @@ -18,6 +18,7 @@ package net.pterodactylus.xdcc.ui.stdin; import java.io.BufferedReader; +import java.io.IOException; import java.io.Reader; import java.io.Writer; import java.util.Collection; @@ -27,11 +28,15 @@ import java.util.Set; import net.pterodactylus.irc.DccReceiver; import net.pterodactylus.xdcc.core.Core; +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.Download; import net.pterodactylus.xdcc.data.Pack; import com.google.common.collect.Lists; import com.google.common.collect.Sets; +import com.google.common.eventbus.Subscribe; import com.google.common.primitives.Ints; import com.google.common.util.concurrent.AbstractExecutionThreadService; @@ -151,6 +156,44 @@ public class CommandReader extends AbstractExecutionThreadService { } // + // EVENT HANDLERS + // + + /** + * Called when a download was started. + * + * @param downloadStarted + * The download started event + */ + @Subscribe + public void downloadStarted(DownloadStarted downloadStarted) { + Download download = downloadStarted.download(); + try { + writer.write(String.format("Download of %s (from %s, %s) has started.\n", download.filename(), download.bot().name(), download.bot().network().name())); + writer.flush(); + } catch (IOException ioe1) { + /* ignore. */ + } + } + + /** + * Called when a download is finished. + * + * @param downloadFinished + * The download finished event + */ + @Subscribe + public void downloadFinished(DownloadFinished downloadFinished) { + Download download = downloadFinished.download(); + try { + writer.write(String.format("Download of %s (from %s, %s) has finished, at %s/s.\n", download.filename(), download.bot().name(), download.bot().network().name(), download.dccReceiver().overallRate())); + writer.flush(); + } catch (IOException ioe1) { + /* ignore. */ + } + } + + // // PRIVATE METHODS //