X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fxdcc%2Fui%2Fstdin%2FCommandReader.java;h=2ef14d7224098db6594f6aa2cc9c3c8e8a66e4a2;hb=d3a8f3edb125265c6feb8b0ccfaa035497c07f15;hp=9c8c86cf2bd3bb4ae8d990f1920629f8314e284d;hpb=424e7ebb1beaf65888251ed3d4d17cca6b39ca24;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 9c8c86c..2ef14d7 100644 --- a/src/main/java/net/pterodactylus/xdcc/ui/stdin/CommandReader.java +++ b/src/main/java/net/pterodactylus/xdcc/ui/stdin/CommandReader.java @@ -18,15 +18,31 @@ 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; +import java.util.Collections; import java.util.List; +import java.util.Set; +import net.pterodactylus.irc.Connection; +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; import com.google.common.collect.Lists; -import com.google.common.collect.Ordering; +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; /** @@ -42,6 +58,9 @@ public class CommandReader extends AbstractExecutionThreadService { /** The reader to read commands from. */ private final BufferedReader reader; + /** The writer to write the results to. */ + private final Writer writer; + /** * Creates a new command reader. * @@ -49,10 +68,13 @@ public class CommandReader extends AbstractExecutionThreadService { * The core being controlled * @param reader * The reader to read commands from + * @param writer + * The write to write results to */ - public CommandReader(Core core, Reader reader) { + public CommandReader(Core core, Reader reader, Writer writer) { this.core = core; this.reader = new BufferedReader(reader); + this.writer = writer; } // @@ -64,6 +86,7 @@ public class CommandReader extends AbstractExecutionThreadService { String lastLine = ""; String line; final List lastResult = Lists.newArrayList(); + final List lastConnections = Lists.newArrayList(); while ((line = reader.readLine()) != null) { if (line.equals("")) { line = lastLine; @@ -71,8 +94,8 @@ public class CommandReader extends AbstractExecutionThreadService { String[] words = line.split(" +"); if (words[0].equalsIgnoreCase("search")) { lastResult.clear(); - for (Bot bot : core.bots()) { - for (Pack pack : bot) { + for (Bot bot : Lists.newArrayList(core.bots())) { + for (Pack pack : Lists.newArrayList(bot)) { boolean found = true; for (int wordIndex = 1; wordIndex < words.length; ++wordIndex) { if (words[wordIndex].startsWith("-") && pack.name().toLowerCase().contains(words[wordIndex].toLowerCase().substring(1))) { @@ -89,17 +112,193 @@ public class CommandReader extends AbstractExecutionThreadService { } } } + Collections.sort(lastResult); + int counter = 0; + for (Result result : lastResult) { + writeLine(String.format("[%d] %s (%s) from %s (#%s) on %s", counter++, result.pack().name(), result.pack().size(), result.bot().name(), result.pack().id(), result.bot().network().name())); + } + writeLine("End of Search."); + } else if (words[0].equalsIgnoreCase("dcc")) { + int counter = 0; + for (Download download : core.downloads()) { + DccReceiver dccReceiver = download.dccReceiver(); + if (dccReceiver == null) { + /* download has not even started. */ + writer.write(String.format("[%d] %s requested from %s (not started yet)\n", counter++, download.pack().name(), download.bot().name())); + continue; + } + writer.write(String.format("[%d] %s from %s (%s, ", counter++, dccReceiver.filename(), download.bot().name(), f(dccReceiver.size()))); + if (dccReceiver.isRunning()) { + writer.write(String.format("%.1f%%, %s", dccReceiver.progress() * 100.0 / dccReceiver.size(), f(dccReceiver.currentRate()))); + } else { + if (dccReceiver.progress() >= dccReceiver.size()) { + writer.write(String.format("complete, %s", f(dccReceiver.overallRate()))); + } else { + writer.write(String.format("aborted at %.1f%%, %s", dccReceiver.progress() * 100.0 / dccReceiver.size(), f(dccReceiver.currentRate()))); + } + } + writer.write("/s)\n"); + } + writeLine("End of DCCs."); + } else if (words[0].equalsIgnoreCase("get")) { + Integer index = Ints.tryParse(words[1]); + if ((index != null) && (index < lastResult.size())) { + core.fetch(lastResult.get(index).bot(), lastResult.get(index).pack()); + } + } else if (words[0].equalsIgnoreCase("stats")) { + int configuredChannelsCount = core.channels().size(); + int joinedChannelsCount = core.joinedChannels().size(); + int extraChannelsCount = core.extraChannels().size(); + Collection bots = core.bots(); + Set packNames = Sets.newHashSet(); + int packsCount = 0; + for (Bot bot : bots) { + packsCount += bot.packs().size(); + for (Pack pack : bot) { + packNames.add(pack.name()); + } + } + + writeLine(String.format("%d channels (%d joined, %d extra), %d bots offering %d packs (%d unique).", configuredChannelsCount, joinedChannelsCount, extraChannelsCount, bots.size(), packsCount, packNames.size())); + } else if (words[0].equalsIgnoreCase("connections")) { + lastConnections.clear(); int counter = 0; - for (Result result : Ordering.natural().sortedCopy(lastResult)) { - System.out.println(String.format("[%d] %s (%s) from %s (#%s) on %s", counter++, result.pack().name(), result.pack().size(), result.bot().name(), result.pack().id(), result.bot().network().name())); + for (Connection connection : core.connections()) { + lastConnections.add(connection); + writer.write(String.format("[%d] %s:%d, %s/s\n", counter++, connection.hostname(), connection.port(), f(connection.getInputRate()))); + } + writeLine("End of connections."); + } else if (words[0].equalsIgnoreCase("disconnect")) { + Integer index = Ints.tryParse(words[1]); + if ((index != null) && (index < lastConnections.size())) { + core.closeConnection(lastConnections.get(index)); } - System.out.println("End of Search."); } lastLine = line; } } + // + // 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 { + 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. */ + } + } + + /** + * Called when a download is finished. + * + * @param downloadFinished + * The download finished event + */ + @Subscribe + 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.pack().name(), download.bot().name(), download.bot().network().name(), f(download.dccReceiver().overallRate()))); + } catch (IOException ioe1) { + /* ignore. */ + } + } + + /** + * Called when a download fails. + * + * @param downloadFailed + * The download failed event + */ + @Subscribe + public void downloadFailed(DownloadFailed downloadFailed) { + Download download = downloadFailed.download(); + try { + writeLine(String.format("Download of %s (from %s, %s) has failed at %.1f%% and %s/s.", download.filename(), download.bot().name(), download.bot().network().name(), download.dccReceiver().progress() * 100.0 / download.dccReceiver().size(), f(download.dccReceiver().overallRate()))); + } catch (IOException ioe1) { + /* ignore. */ + } + } + + /** + * 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 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 + // + + /** + * Writes the given line followed by an LF to the {@link #writer}. + * + * @param line + * The line to write + * @throws IOException + * if an I/O error occurs + */ + private void writeLine(String line) throws IOException { + writer.write(line + "\n"); + writer.flush(); + } + + /** + * Converts large numbers into a human-friendly format, by showing SI prefixes + * for ×1024 (K), ×1048576 (M), and ×1073741824 (G). + * + * @param number + * The number to convert + * @return The converted number + */ + private static String f(long number) { + if (number >= (1 << 30)) { + return String.format("%.1fG", number / (double) (1 << 30)); + } + if (number >= (1 << 20)) { + return String.format("%.1fM", number / (double) (1 << 20)); + } + if (number >= (1 << 10)) { + return String.format("%.1fK", number / (double) (1 << 10)); + } + return String.format("%dB", number); + } + /** Container for result information. */ private static class Result implements Comparable {