From a6ccbb2473cac95ffda3206b0c612efce3fceb4b Mon Sep 17 00:00:00 2001 From: Xpl0itU <24777100+Xpl0itU@users.noreply.github.com> Date: Tue, 16 Apr 2024 15:26:43 +0200 Subject: [PATCH] Fix downloaded size being incorrectly reported --- cmd/WiiUDownloader/progressWindow.go | 4 +++- downloader.go | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/cmd/WiiUDownloader/progressWindow.go b/cmd/WiiUDownloader/progressWindow.go index a6ba450..86da009 100644 --- a/cmd/WiiUDownloader/progressWindow.go +++ b/cmd/WiiUDownloader/progressWindow.go @@ -128,8 +128,10 @@ func (pw *ProgressWindow) SetDownloadSize(size int64) { pw.totalToDownload = size } -func (pw *ProgressWindow) ResetTotalDownloaded() { +func (pw *ProgressWindow) ResetTotals() { pw.progressPerFile = make(map[string]int64) + pw.totalDownloaded = 0 + pw.totalToDownload = 0 } func (pw *ProgressWindow) MarkFileAsDone(filename string) { diff --git a/downloader.go b/downloader.go index f51d44a..02703c6 100644 --- a/downloader.go +++ b/downloader.go @@ -35,7 +35,7 @@ type ProgressReporter interface { Cancelled() bool SetCancelled() SetDownloadSize(size int64) - ResetTotalDownloaded() + ResetTotals() MarkFileAsDone(filename string) SetTotalDownloadedForFile(filename string, downloaded int64) SetStartTime(startTime time.Time) @@ -161,7 +161,7 @@ func downloadFile(progressReporter ProgressReporter, client *http.Client, downlo func DownloadTitle(titleID, outputDirectory string, doDecryption bool, progressReporter ProgressReporter, deleteEncryptedContents bool, client *http.Client) error { tEntry := getTitleEntryFromTid(titleID) - progressReporter.ResetTotalDownloaded() + progressReporter.ResetTotals() progressReporter.SetGameTitle(tEntry.Name) outputDir := strings.TrimRight(outputDirectory, "/\\")