mirrors/WiiUDownloader
1
0
Fork 0
mirror of https://github.com/Xpl0itU/WiiUDownloader.git synced 2025-05-28 22:16:04 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve cancelling the queue

Browse source
This commit is contained in:
Xpl0itU 2023-09-10 15:57:40 +02:00
parent 8f13b57ae8
commit 0a16ffdb7f
2 changed files with 15 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
cmd/WiiUDownloader/mainwindow.go
View file

@ -2,6 +2,7 @@ package main
import (
"bytes"
"context"
"encoding/binary"
"fmt"
"os"
@ -743,11 +744,20 @@ func (mw *MainWindow) onDownloadQueueClicked(selectedPath string) error {
defer close(queueStatusChan)
errGroup := errgroup.Group{}
queueCtx, cancel := context.WithCancel(context.Background())
defer cancel()
for _, title := range mw.titleQueue {
errGroup.Go(func() error {
select {
case <-queueCtx.Done():
queueStatusChan <- true
return nil
default:
}
tidStr := fmt.Sprintf("%016x", title.TitleID)
titlePath := filepath.Join(selectedPath, fmt.Sprintf("%s [%s] [%s]", normalizeFilename(title.Name), wiiudownloader.GetFormattedKind(title.TitleID), tidStr))
if err := wiiudownloader.DownloadTitle(tidStr, titlePath, mw.decryptContents, mw.progressWindow, mw.getDeleteEncryptedContents(), mw.logger); err != nil {
if err := wiiudownloader.DownloadTitle(cancel, tidStr, titlePath, mw.decryptContents, mw.progressWindow, mw.getDeleteEncryptedContents(), mw.logger); err != nil {
return err
}

5
downloader.go
View file

@ -2,6 +2,7 @@ package wiiudownloader
import (
"bytes"
"context"
"crypto/aes"
"crypto/cipher"
"encoding/binary"
@ -69,7 +70,7 @@ func downloadFile(progressReporter ProgressReporter, client *grab.Client, downlo
return nil
}
func DownloadTitle(titleID, outputDirectory string, doDecryption bool, progressReporter ProgressReporter, deleteEncryptedContents bool, logger *Logger) error {
func DownloadTitle(cancel context.CancelFunc, titleID, outputDirectory string, doDecryption bool, progressReporter ProgressReporter, deleteEncryptedContents bool, logger *Logger) error {
titleEntry := getTitleEntryFromTid(titleID)
progressReporter.SetGameTitle(titleEntry.Name)
@ -181,12 +182,14 @@ func DownloadTitle(titleID, outputDirectory string, doDecryption bool, progressR
}
if err := checkContentHashes(outputDirectory, content, cipherHashTree); err != nil {
if progressReporter.Cancelled() {
cancel()
break
}
return err
}
}
if progressReporter.Cancelled() {
cancel()
break
}
}