Add command to show active DCC receivers.

[xudocci.git] / src / main / java / net / pterodactylus / xdcc / ui / stdin / CommandReader.java

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..059d63d 100644 (file)
--- a/src/main/java/net/pterodactylus/xdcc/ui/stdin/CommandReader.java
+++ b/src/main/java/net/pterodactylus/xdcc/ui/stdin/CommandReader.java
@@ -19,14 +19,16 @@ package net.pterodactylus.xdcc.ui.stdin;
 
 import java.io.BufferedReader;
 import java.io.Reader;
+import java.io.Writer;
+import java.util.Collections;
 import java.util.List;
 
+import net.pterodactylus.irc.DccReceiver;
 import net.pterodactylus.xdcc.core.Core;
 import net.pterodactylus.xdcc.data.Bot;
 import net.pterodactylus.xdcc.data.Pack;
 
 import com.google.common.collect.Lists;
-import com.google.common.collect.Ordering;
 import com.google.common.util.concurrent.AbstractExecutionThreadService;
 
 /**
@@ -42,6 +44,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 +54,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;
        }
 
        //
@@ -89,14 +97,22 @@ public class CommandReader extends AbstractExecutionThreadService {
                                                }
                                        }
                                }
+                               Collections.sort(lastResult);
+                               int counter = 0;
+                               for (Result result : lastResult) {
+                                       writer.write(String.format("[%d] %s (%s) from %s (#%s) on %s\n", counter++, result.pack().name(), result.pack().size(), result.bot().name(), result.pack().id(), result.bot().network().name()));
+                               }
+                               writer.write("End of Search.\n");
+                       } else if (words[0].equalsIgnoreCase("dcc")) {
                                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 (DccReceiver dccReceiver : core.dccReceivers()) {
+                                       writer.write(String.format("[%d] %s (%s, %d%%%s)\n", counter++, dccReceiver.filename(), dccReceiver.size(), dccReceiver.progress() * 100 / dccReceiver.size(), dccReceiver.isRunning() ? "" : ", finished"));
                                }
-                               System.out.println("End of Search.");
+                               writer.write("End of DCCs.\n");
                        }
 
                        lastLine = line;
+                       writer.flush();
                }
        }