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

Add HTTP client and timeout to improve performance

Browse source
This commit is contained in:
Xpl0itU 2024-01-17 20:53:13 +01:00
parent 965a1b6602
commit 06fdac5fa3
3 changed files with 18 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
cmd/WiiUDownloader/main.go
View file

@ -2,9 +2,11 @@ package main
import ( import (
"fmt" "fmt"
"net/http"
"os" "os"
"path/filepath" "path/filepath"
"runtime" "runtime"
"time"
wiiudownloader "github.com/Xpl0itU/WiiUDownloader" wiiudownloader "github.com/Xpl0itU/WiiUDownloader"
"github.com/gotk3/gotk3/glib" "github.com/gotk3/gotk3/glib"
@ -39,8 +41,18 @@ func main() {
if err != nil { if err != nil {
logger.Fatal(err.Error()) logger.Fatal(err.Error())
} }
client := &http.Client{
Transport: &http.Transport{
MaxIdleConns: 1000,
MaxIdleConnsPerHost: 1000,
MaxConnsPerHost: 100,
},
Timeout: 30 * time.Second,
}
app.Connect("activate", func() { app.Connect("activate", func() {
win := NewMainWindow(app, wiiudownloader.GetTitleEntries(wiiudownloader.TITLE_CATEGORY_GAME), logger) win := NewMainWindow(app, wiiudownloader.GetTitleEntries(wiiudownloader.TITLE_CATEGORY_GAME), logger, client)
win.ShowAll() win.ShowAll()
app.AddWindow(win.window) app.AddWindow(win.window)
app.GetActiveWindow().Show() app.GetActiveWindow().Show()

6
cmd/WiiUDownloader/mainwindow.go
View file

@ -40,9 +40,10 @@ type MainWindow struct {
titles []wiiudownloader.TitleEntry titles []wiiudownloader.TitleEntry
decryptContents bool decryptContents bool
currentRegion uint8 currentRegion uint8
client *http.Client
} }
func NewMainWindow(app *gtk.Application, entries []wiiudownloader.TitleEntry, logger *wiiudownloader.Logger) *MainWindow { func NewMainWindow(app *gtk.Application, entries []wiiudownloader.TitleEntry, logger *wiiudownloader.Logger, client *http.Client) *MainWindow {
gSettings, err := gtk.SettingsGetDefault() gSettings, err := gtk.SettingsGetDefault()
if err != nil { if err != nil {
logger.Error(err.Error()) logger.Error(err.Error())
@ -72,6 +73,7 @@ func NewMainWindow(app *gtk.Application, entries []wiiudownloader.TitleEntry, lo
currentRegion: wiiudownloader.MCP_REGION_EUROPE | wiiudownloader.MCP_REGION_JAPAN | wiiudownloader.MCP_REGION_USA, currentRegion: wiiudownloader.MCP_REGION_EUROPE | wiiudownloader.MCP_REGION_JAPAN | wiiudownloader.MCP_REGION_USA,
logger: logger, logger: logger,
lastSearchText: "", lastSearchText: "",
client: client,
} }
searchEntry.Connect("changed", mainWindow.onSearchEntryChanged) searchEntry.Connect("changed", mainWindow.onSearchEntryChanged)
@ -758,7 +760,7 @@ func (mw *MainWindow) onDownloadQueueClicked(selectedPath string) error {
} }
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); err != nil && err != context.Canceled { if err := wiiudownloader.DownloadTitle(queueCtx, tidStr, titlePath, mw.decryptContents, mw.progressWindow, mw.getDeleteEncryptedContents(), mw.logger, mw.client); err != nil && err != context.Canceled {
return err return err
} }

3
downloader.go
View file

@ -111,7 +111,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) error { func DownloadTitle(cancelCtx context.Context, titleID, outputDirectory string, doDecryption bool, progressReporter ProgressReporter, deleteEncryptedContents bool, logger *Logger, client *http.Client) error {
titleEntry := getTitleEntryFromTid(titleID) titleEntry := getTitleEntryFromTid(titleID)
progressReporter.SetTotalDownloaded(0) progressReporter.SetTotalDownloaded(0)
@ -128,7 +128,6 @@ func DownloadTitle(cancelCtx context.Context, titleID, outputDirectory string, d
return err return err
} }
client := &http.Client{}
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(cancelCtx, progressReporter, client, fmt.Sprintf("%s/%s", baseURL, "tmd"), tmdPath, true); err != nil {
if progressReporter.Cancelled() { if progressReporter.Cancelled() {