X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fxdcc%2Fui%2Fstdin%2FCommandReader.java;h=fc1a48fefa6e3930d140f736a541af4ded911045;hb=1668dc75b65956d82ddfeb50a09ef04991996511;hp=83c98023d8aa9d50f2c7ed06a3f20bd57d6b018c;hpb=38f71a02b5068c3a1ab349d2c9e780af155a5018;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..fc1a48f 100644 --- a/src/main/java/net/pterodactylus/xdcc/ui/stdin/CommandReader.java +++ b/src/main/java/net/pterodactylus/xdcc/ui/stdin/CommandReader.java @@ -62,7 +62,7 @@ public class CommandReader extends AbstractExecutionThreadService { /** The writer to write the results to. */ private final Writer writer; - private final DownloadFailures downloadFailures; + private final Collection failedDownloads; /** * Creates a new command reader. @@ -74,10 +74,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 failedDownloads) { this.reader = new BufferedReader(reader); this.writer = writer; - this.downloadFailures = downloadFailures; + this.failedDownloads = failedDownloads; /* initialize commands. */ ImmutableList.Builder commandBuilder = ImmutableList.builder(); @@ -88,8 +88,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(); } @@ -170,7 +170,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) {