X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fxdcc%2Fui%2Fstdin%2FCommandReader.java;h=795fe98f8ecea5318b3a2555dc91aee31316483d;hb=3a3abe24dd88355af0c67dd9c40dac2bec6c6c14;hp=74b365a97a2e7ee11365183027cf9e44524c88f4;hpb=a3fb82f62375a86c959ab6a84995fb142bca7162;p=xudocci.git 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 74b365a..795fe98 100644 --- a/src/main/java/net/pterodactylus/xdcc/ui/stdin/CommandReader.java +++ b/src/main/java/net/pterodactylus/xdcc/ui/stdin/CommandReader.java @@ -32,6 +32,7 @@ import net.pterodactylus.xdcc.core.Core; import net.pterodactylus.xdcc.core.event.DownloadFailed; import net.pterodactylus.xdcc.core.event.DownloadFinished; import net.pterodactylus.xdcc.core.event.DownloadStarted; +import net.pterodactylus.xdcc.core.event.GenericMessage; import net.pterodactylus.xdcc.core.event.MessageReceived; import net.pterodactylus.xdcc.data.Bot; import net.pterodactylus.xdcc.data.Download; @@ -171,7 +172,7 @@ public class CommandReader extends AbstractExecutionThreadService { public void downloadStarted(DownloadStarted downloadStarted) { Download download = downloadStarted.download(); try { - writeLine(String.format("Download of %s (from %s, %s) has started.", download.filename(), download.bot().name(), download.bot().network().name())); + writeLine(String.format("Download of %s (from %s, %s) has started.", download.pack().name(), download.bot().name(), download.bot().network().name())); } catch (IOException ioe1) { /* ignore. */ } @@ -187,7 +188,7 @@ public class CommandReader extends AbstractExecutionThreadService { public void downloadFinished(DownloadFinished downloadFinished) { Download download = downloadFinished.download(); try { - writeLine(String.format("Download of %s (from %s, %s) has finished, at %s/s.", download.filename(), download.bot().name(), download.bot().network().name(), f(download.dccReceiver().overallRate()))); + writeLine(String.format("Download of %s (from %s, %s) has finished, at %s/s.", download.pack().name(), download.bot().name(), download.bot().network().name(), f(download.dccReceiver().overallRate()))); } catch (IOException ioe1) { /* ignore. */ } @@ -224,6 +225,21 @@ public class CommandReader extends AbstractExecutionThreadService { } } + /** + * Writes a generic message to the console. + * + * @param genericMessage + * The generic message event + */ + @Subscribe + public void genericMessage(GenericMessage genericMessage) { + try { + writeLine(genericMessage.message()); + } catch (IOException ioe1) { + /* ignore. */ + } + } + // // PRIVATE METHODS //