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

Remove context

Browse source
This commit is contained in:
Xpl0itU 2024-04-13 15:57:32 +02:00
parent 33f0de7346
commit c7dd2a2f73
3 changed files with 14 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

9
certificate.go
View file

@ -2,7 +2,6 @@ package wiiudownloader
import ( import (
"bytes" "bytes"
"context"
"fmt" "fmt"
"net/http" "net/http"
"os" "os"
@ -28,12 +27,12 @@ func getCert(tmdData []byte, id int, numContents uint16) ([]byte, error) {
} }
} }
func getDefaultCert(cancelCtx context.Context, progressReporter ProgressReporter, client *http.Client) ([]byte, error) { func getDefaultCert(progressReporter ProgressReporter, client *http.Client) ([]byte, error) {
if len(cetkData) >= 0x350+0x300 { if len(cetkData) >= 0x350+0x300 {
return cetkData[0x350 : 0x350+0x300], nil return cetkData[0x350 : 0x350+0x300], nil
} }
cetkDir := path.Join(os.TempDir(), "cetk") cetkDir := path.Join(os.TempDir(), "cetk")
if err := downloadFile(cancelCtx, progressReporter, client, "http://ccs.cdn.c.shop.nintendowifi.net/ccs/download/000500101000400a/cetk", cetkDir, true); err != nil { if err := downloadFile(progressReporter, client, "http://ccs.cdn.c.shop.nintendowifi.net/ccs/download/000500101000400a/cetk", cetkDir, true); err != nil {
return nil, err return nil, err
} }
cetkData, err := os.ReadFile(cetkDir) cetkData, err := os.ReadFile(cetkDir)
@ -51,7 +50,7 @@ func getDefaultCert(cancelCtx context.Context, progressReporter ProgressReporter
return nil, fmt.Errorf("failed to download OSv10 cetk, length: %d", len(cetkData)) return nil, fmt.Errorf("failed to download OSv10 cetk, length: %d", len(cetkData))
} }
func GenerateCert(tmdData []byte, contentCount uint16, progressReporter ProgressReporter, client *http.Client, cancelCtx context.Context) (bytes.Buffer, error) { func GenerateCert(tmdData []byte, contentCount uint16, progressReporter ProgressReporter, client *http.Client) (bytes.Buffer, error) {
cert := bytes.Buffer{} cert := bytes.Buffer{}
cert0, err := getCert(tmdData, 0, contentCount) cert0, err := getCert(tmdData, 0, contentCount)
@ -66,7 +65,7 @@ func GenerateCert(tmdData []byte, contentCount uint16, progressReporter Progress
} }
cert.Write(cert1) cert.Write(cert1)
defaultCert, err := getDefaultCert(cancelCtx, progressReporter, client) defaultCert, err := getDefaultCert(progressReporter, client)
if err != nil { if err != nil {
return bytes.Buffer{}, err return bytes.Buffer{}, err
} }

12
cmd/WiiUDownloader/mainwindow.go
View file

@ -265,7 +265,7 @@ func (mw *MainWindow) ShowAll() {
wiiudownloader.GenerateTicket(filepath.Join(parentDir, "title.tik"), titleID, titleKey, titleVersion) wiiudownloader.GenerateTicket(filepath.Join(parentDir, "title.tik"), titleID, titleKey, titleVersion)
cert, err := wiiudownloader.GenerateCert(tmdData, contentCount, mw.progressWindow, http.DefaultClient, context.Background()) cert, err := wiiudownloader.GenerateCert(tmdData, contentCount, mw.progressWindow, http.DefaultClient)
if err != nil { if err != nil {
return return
} }
@ -746,21 +746,15 @@ func (mw *MainWindow) onDownloadQueueClicked(selectedPath string) error {
defer close(queueStatusChan) defer close(queueStatusChan)
errGroup := errgroup.Group{} errGroup := errgroup.Group{}
queueCtx, cancel := context.WithCancel(context.Background())
mw.progressWindow.cancelFunc = cancel
defer mw.progressWindow.cancelFunc()
for _, title := range mw.titleQueue { for _, title := range mw.titleQueue {
errGroup.Go(func() error { errGroup.Go(func() error {
select { if mw.progressWindow.cancelled {
case <-queueCtx.Done():
queueStatusChan <- true queueStatusChan <- true
return nil return nil
default:
} }
tidStr := fmt.Sprintf("%016x", title.TitleID) tidStr := fmt.Sprintf("%016x", title.TitleID)
titlePath := filepath.Join(selectedPath, fmt.Sprintf("%s [%s] [%s]", normalizeFilename(title.Name), wiiudownloader.GetFormattedKind(title.TitleID), tidStr)) titlePath := filepath.Join(selectedPath, fmt.Sprintf("%s [%s] [%s]", normalizeFilename(title.Name), wiiudownloader.GetFormattedKind(title.TitleID), tidStr))
if err := wiiudownloader.DownloadTitle(queueCtx, tidStr, titlePath, mw.decryptContents, mw.progressWindow, mw.getDeleteEncryptedContents(), mw.logger, mw.client); err != nil && err != context.Canceled { if err := wiiudownloader.DownloadTitle(tidStr, titlePath, mw.decryptContents, mw.progressWindow, mw.getDeleteEncryptedContents(), mw.logger, mw.client); err != nil && err != context.Canceled {
return err return err
} }

16
downloader.go
View file

@ -2,7 +2,6 @@ package wiiudownloader
import ( import (
"bytes" "bytes"
"context"
"encoding/binary" "encoding/binary"
"fmt" "fmt"
"io" "io"
@ -29,7 +28,7 @@ type ProgressReporter interface {
AddToTotalDownloaded(toAdd int64) AddToTotalDownloaded(toAdd int64)
} }
func downloadFile(ctx context.Context, progressReporter ProgressReporter, client *http.Client, downloadURL, dstPath string, doRetries bool) error { func downloadFile(progressReporter ProgressReporter, client *http.Client, downloadURL, dstPath string, doRetries bool) error {
filePath := filepath.Base(dstPath) filePath := filepath.Base(dstPath)
for attempt := 1; attempt <= maxRetries; attempt++ { for attempt := 1; attempt <= maxRetries; attempt++ {
@ -39,7 +38,6 @@ func downloadFile(ctx context.Context, progressReporter ProgressReporter, client
} }
req.Header.Set("User-Agent", "WiiUDownloader") req.Header.Set("User-Agent", "WiiUDownloader")
req = req.WithContext(ctx)
resp, err := client.Do(req) resp, err := client.Do(req)
if err != nil { if err != nil {
@ -84,7 +82,7 @@ func downloadFile(ctx context.Context, progressReporter ProgressReporter, client
return nil return nil
} }
func DownloadTitle(cancelCtx context.Context, titleID, outputDirectory string, doDecryption bool, progressReporter ProgressReporter, deleteEncryptedContents bool, logger *Logger, client *http.Client) error { func DownloadTitle(titleID, outputDirectory string, doDecryption bool, progressReporter ProgressReporter, deleteEncryptedContents bool, logger *Logger, client *http.Client) error {
tEntry := getTitleEntryFromTid(titleID) tEntry := getTitleEntryFromTid(titleID)
progressReporter.SetTotalDownloaded(0) progressReporter.SetTotalDownloaded(0)
@ -98,7 +96,7 @@ func DownloadTitle(cancelCtx context.Context, titleID, outputDirectory string, d
} }
tmdPath := filepath.Join(outputDir, "title.tmd") tmdPath := filepath.Join(outputDir, "title.tmd")
if err := downloadFile(cancelCtx, progressReporter, client, fmt.Sprintf("%s/%s", baseURL, "tmd"), tmdPath, true); err != nil { if err := downloadFile(progressReporter, client, fmt.Sprintf("%s/%s", baseURL, "tmd"), tmdPath, true); err != nil {
if progressReporter.Cancelled() { if progressReporter.Cancelled() {
return nil return nil
} }
@ -116,7 +114,7 @@ func DownloadTitle(cancelCtx context.Context, titleID, outputDirectory string, d
} }
tikPath := filepath.Join(outputDir, "title.tik") tikPath := filepath.Join(outputDir, "title.tik")
if err := downloadFile(cancelCtx, progressReporter, client, fmt.Sprintf("%s/%s", baseURL, "cetk"), tikPath, false); err != nil { if err := downloadFile(progressReporter, client, fmt.Sprintf("%s/%s", baseURL, "cetk"), tikPath, false); err != nil {
if progressReporter.Cancelled() { if progressReporter.Cancelled() {
return nil return nil
} }
@ -150,7 +148,7 @@ func DownloadTitle(cancelCtx context.Context, titleID, outputDirectory string, d
progressReporter.SetDownloadSize(int64(titleSize)) progressReporter.SetDownloadSize(int64(titleSize))
cert, err := GenerateCert(tmdData, contentCount, progressReporter, client, cancelCtx) cert, err := GenerateCert(tmdData, contentCount, progressReporter, client)
if err != nil { if err != nil {
if progressReporter.Cancelled() { if progressReporter.Cancelled() {
return nil return nil
@ -179,7 +177,7 @@ func DownloadTitle(cancelCtx context.Context, titleID, outputDirectory string, d
return err return err
} }
filePath := filepath.Join(outputDir, fmt.Sprintf("%08X.app", content.ID)) filePath := filepath.Join(outputDir, fmt.Sprintf("%08X.app", content.ID))
if err := downloadFile(cancelCtx, progressReporter, client, fmt.Sprintf("%s/%08X", baseURL, content.ID), filePath, true); err != nil { if err := downloadFile(progressReporter, client, fmt.Sprintf("%s/%08X", baseURL, content.ID), filePath, true); err != nil {
if progressReporter.Cancelled() { if progressReporter.Cancelled() {
break break
} }
@ -189,7 +187,7 @@ func DownloadTitle(cancelCtx context.Context, titleID, outputDirectory string, d
if tmdData[offset+7]&0x2 == 2 { if tmdData[offset+7]&0x2 == 2 {
filePath = filepath.Join(outputDir, fmt.Sprintf("%08X.h3", content.ID)) filePath = filepath.Join(outputDir, fmt.Sprintf("%08X.h3", content.ID))
if err := downloadFile(cancelCtx, progressReporter, client, fmt.Sprintf("%s/%08X.h3", baseURL, content.ID), filePath, true); err != nil { if err := downloadFile(progressReporter, client, fmt.Sprintf("%s/%08X.h3", baseURL, content.ID), filePath, true); err != nil {
if progressReporter.Cancelled() { if progressReporter.Cancelled() {
break break
} }