import java.util.Set;
import net.pterodactylus.irc.DccReceiver;
+import net.pterodactylus.irc.util.MessageCleaner;
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;
import net.pterodactylus.xdcc.data.Pack;
} else if (words[0].equalsIgnoreCase("dcc")) {
int counter = 0;
for (DccReceiver dccReceiver : core.dccReceivers()) {
- write(String.format("[%d] %s (%s, ", counter++, dccReceiver.filename(), dccReceiver.size()));
+ writer.write(String.format("[%d] %s (%s, ", counter++, dccReceiver.filename(), f(dccReceiver.size())));
if (dccReceiver.isRunning()) {
- write(String.format("%.1f%%, %s", dccReceiver.progress() * 100.0 / dccReceiver.size(), f(dccReceiver.currentRate())));
+ writer.write(String.format("%.1f%%, %s", dccReceiver.progress() * 100.0 / dccReceiver.size(), f(dccReceiver.currentRate())));
} else {
if (dccReceiver.progress() >= dccReceiver.size()) {
- write(String.format("complete, %s", f(dccReceiver.overallRate())));
+ writer.write(String.format("complete, %s", f(dccReceiver.overallRate())));
} else {
- write(String.format("aborted at %.1f%%, %s", dccReceiver.progress() * 100.0 / dccReceiver.size(), f(dccReceiver.currentRate())));
+ writer.write(String.format("aborted at %.1f%%, %s", dccReceiver.progress() * 100.0 / dccReceiver.size(), f(dccReceiver.currentRate())));
}
}
- write("/s)\n");
+ writer.write("/s)\n");
}
writeLine("End of DCCs.");
} else if (words[0].equalsIgnoreCase("get")) {
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. */
}
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. */
}
}
}
- //
- // PRIVATE METHODS
- //
+ /**
+ * Displays the received message on the console.
+ *
+ * @param messageReceived
+ * The message received event
+ */
+ @Subscribe
+ public void messageReceived(MessageReceived messageReceived) {
+ try {
+ writeLine(String.format("Message from %s: %s", messageReceived.source(), MessageCleaner.getDefaultInstance().clean(messageReceived.message())));
+ } catch (IOException e) {
+ /* ignore. */
+ }
+ }
/**
- * Writes the given text to the {@link #writer}.
+ * Writes a generic message to the console.
*
- * @param text
- * The text to write
- * @throws IOException
- * if an I/O error occurs
+ * @param genericMessage
+ * The generic message event
*/
- private void write(String text) throws IOException {
- writer.write(text);
- writer.flush();
+ @Subscribe
+ public void genericMessage(GenericMessage genericMessage) {
+ try {
+ writeLine(genericMessage.message());
+ } catch (IOException ioe1) {
+ /* ignore. */
+ }
}
+ //
+ // PRIVATE METHODS
+ //
+
/**
* Writes the given line followed by an LF to the {@link #writer}.
*