X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fxdcc%2Fui%2Fstdin%2FCommandReader.java;h=66447b06d9b628a940532f3fe84d31493c41bfcd;hb=5e7f77e44cacc40da04ac9f744566de0710b12a1;hp=381c519948e10b130fd0bb29bf221e2fc9e4cbd3;hpb=d616b16a772b4ac0c2bf8709e5f895f609581f84;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 381c519..66447b0 100644
--- a/src/main/java/net/pterodactylus/xdcc/ui/stdin/CommandReader.java
+++ b/src/main/java/net/pterodactylus/xdcc/ui/stdin/CommandReader.java
@@ -28,6 +28,7 @@ import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.Reader;
 import java.io.Writer;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
@@ -39,6 +40,7 @@ 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.Download;
+import net.pterodactylus.xdcc.util.io.DuplicateLineSuppressingWriter;
 
 import com.google.common.base.Joiner;
 import com.google.common.base.Optional;
@@ -61,7 +63,8 @@ public class CommandReader extends AbstractExecutionThreadService {
 	private final BufferedReader reader;
 
 	/** The writer to write the results to. */
-	private final Writer writer;
+	private final DuplicateLineSuppressingWriter writer;
+	private final Collection<Download> failedDownloads;
 
 	/**
 	 * Creates a new command reader.
@@ -73,9 +76,10 @@ public class CommandReader extends AbstractExecutionThreadService {
 	 * @param writer
 	 * 		The write to write results to
 	 */
-	public CommandReader(Core core, Reader reader, Writer writer) {
+	public CommandReader(Core core, Reader reader, Writer writer, Collection<Download> failedDownloads) {
 		this.reader = new BufferedReader(reader);
-		this.writer = writer;
+		this.writer = new DuplicateLineSuppressingWriter(writer);
+		this.failedDownloads = failedDownloads;
 
 		/* initialize commands. */
 		ImmutableList.Builder<Command> commandBuilder = ImmutableList.builder();
@@ -86,6 +90,10 @@ public class CommandReader extends AbstractExecutionThreadService {
 		commandBuilder.add(new ListConnectionsCommand(core));
 		commandBuilder.add(new AbortDownloadCommand(core));
 		commandBuilder.add(new DisconnectCommand(core));
+		commandBuilder.add(new FailedDownloadsCommand(failedDownloads));
+		commandBuilder.add(new RestartCommand(core, failedDownloads));
+		commandBuilder.add(new ResearchCommand(core));
+		commandBuilder.add(new UptimeCommand(core));
 		commands = commandBuilder.build();
 	}
 
@@ -103,6 +111,7 @@ public class CommandReader extends AbstractExecutionThreadService {
 			if (line.equals("")) {
 				line = lastLine;
 			}
+			writer.reset();
 			String[] words = line.split(" +");
 			String commandName = words[0];
 			Collection<Command> eligibleCommands = findEligibleCommands(commandName);
@@ -114,6 +123,7 @@ public class CommandReader extends AbstractExecutionThreadService {
 				Command command = eligibleCommands.iterator().next();
 				List<String> parameters = from(asList(words)).skip(1).toList();
 				state = command.execute(state, parameters, writer);
+				writer.flush();
 			}
 
 			lastLine = line;
@@ -149,6 +159,7 @@ public class CommandReader extends AbstractExecutionThreadService {
 	@Subscribe
 	public void downloadFinished(DownloadFinished downloadFinished) {
 		Download download = downloadFinished.download();
+		removeFailedDownloads(download.pack().name());
 		try {
 			writeLine(green(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) {
@@ -156,6 +167,16 @@ public class CommandReader extends AbstractExecutionThreadService {
 		}
 	}
 
+	private void removeFailedDownloads(String name) {
+		List<Download> failedDownloadsToRemove = new ArrayList<>();
+		for (Download failedDownload : failedDownloads) {
+			if (failedDownload.pack().name().equals(name)) {
+				failedDownloadsToRemove.add(failedDownload);
+			}
+		}
+		failedDownloads.removeAll(failedDownloadsToRemove);
+	}
+
 	/**
 	 * Called when a download fails.
 	 *
@@ -165,6 +186,7 @@ public class CommandReader extends AbstractExecutionThreadService {
 	@Subscribe
 	public void downloadFailed(DownloadFailed downloadFailed) {
 		Download download = downloadFailed.download();
+		failedDownloads.add(download);
 		try {
 			writeLine(red(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) {