X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fxdcc%2Fui%2Fstdin%2FCommandReader.java;h=016c9d0be90895637ab8ab68ec0f94fdae9ce6e7;hb=57e8c8f027adafe3323eb19912476fbd3b1fc317;hp=56bfd33b0e02a6b1a59ee629309375f949e4d9a5;hpb=7bbf28951def7e9124fb691d989de0131037b766;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 56bfd33..016c9d0 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;
 
@@ -62,7 +63,7 @@ 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;
 
 	/**
@@ -109,6 +110,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);
@@ -155,6 +157,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) {
@@ -162,6 +165,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.
 	 *