X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fxdcc%2Fui%2Fstdin%2FCommandReader.java;h=2d0a35292a0f525fc70aba6b274dcf366b063586;hb=57fa2048f94ac1975ed4a417fbc0150dd9277f00;hp=83c98023d8aa9d50f2c7ed06a3f20bd57d6b018c;hpb=f76ee64d2cd93a0439c6306e1fcf6230c633590c;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 83c9802..2d0a352 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,8 +63,8 @@ public class CommandReader extends AbstractExecutionThreadService {
 	private final BufferedReader reader;
 
 	/** The writer to write the results to. */
-	private final Writer writer;
-	private final DownloadFailures downloadFailures;
+	private final DuplicateLineSuppressingWriter writer;
+	private final Collection<Download> failedDownloads;
 
 	/**
 	 * Creates a new command reader.
@@ -74,10 +76,10 @@ public class CommandReader extends AbstractExecutionThreadService {
 	 * @param writer
 	 * 		The write to write results to
 	 */
-	public CommandReader(Core core, Reader reader, Writer writer, DownloadFailures downloadFailures) {
+	public CommandReader(Core core, Reader reader, Writer writer, Collection<Download> failedDownloads) {
 		this.reader = new BufferedReader(reader);
-		this.writer = writer;
-		this.downloadFailures = downloadFailures;
+		this.writer = new DuplicateLineSuppressingWriter(writer);
+		this.failedDownloads = failedDownloads;
 
 		/* initialize commands. */
 		ImmutableList.Builder<Command> commandBuilder = ImmutableList.builder();
@@ -88,8 +90,8 @@ public class CommandReader extends AbstractExecutionThreadService {
 		commandBuilder.add(new ListConnectionsCommand(core));
 		commandBuilder.add(new AbortDownloadCommand(core));
 		commandBuilder.add(new DisconnectCommand(core));
-		commandBuilder.add(new FailedDownloadsCommand(downloadFailures));
-		commandBuilder.add(new RestartCommand(core, downloadFailures));
+		commandBuilder.add(new FailedDownloadsCommand(failedDownloads));
+		commandBuilder.add(new RestartCommand(core, failedDownloads));
 		commandBuilder.add(new ResearchCommand(core));
 		commands = commandBuilder.build();
 	}
@@ -108,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);
@@ -119,6 +122,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;
@@ -154,6 +158,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) {
@@ -161,6 +166,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.
 	 *
@@ -170,7 +185,7 @@ public class CommandReader extends AbstractExecutionThreadService {
 	@Subscribe
 	public void downloadFailed(DownloadFailed downloadFailed) {
 		Download download = downloadFailed.download();
-		downloadFailures.addFailedDownload(download, System.currentTimeMillis());
+		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) {