From 5d48312060d90136ddd223a2e731f5f64ef6c732 Mon Sep 17 00:00:00 2001 From: Vilsol Date: Fri, 29 Dec 2023 11:27:49 -0800 Subject: [PATCH] fix: store target in cache filename (#54) --- cli/installations.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cli/installations.go b/cli/installations.go index 3279994..dc5005b 100644 --- a/cli/installations.go +++ b/cli/installations.go @@ -483,7 +483,7 @@ func (i *Installation) Install(ctx *GlobalContext, updates chan<- InstallUpdate) // Only install if a link is provided, otherwise assume mod is already installed if target.Link != "" { - err := downloadAndExtractMod(modReference, version.Version, target.Link, target.Hash, modsDirectory, updates, downloadSemaphore, d) + err := downloadAndExtractMod(modReference, version.Version, target.Link, target.Hash, platform.TargetName, modsDirectory, updates, downloadSemaphore, d) if err != nil { return fmt.Errorf("failed to install %s@%s: %w", modReference, version.Version, err) } @@ -560,7 +560,7 @@ func (i *Installation) UpdateMods(ctx *GlobalContext, mods []string) error { return nil } -func downloadAndExtractMod(modReference string, version string, link string, hash string, modsDirectory string, updates chan<- InstallUpdate, downloadSemaphore chan int, d disk.Disk) error { +func downloadAndExtractMod(modReference string, version string, link string, hash string, target string, modsDirectory string, updates chan<- InstallUpdate, downloadSemaphore chan int, d disk.Disk) error { var downloadUpdates chan utils.GenericProgress var wg sync.WaitGroup @@ -585,7 +585,7 @@ func downloadAndExtractMod(modReference string, version string, link string, has } slog.Info("downloading mod", slog.String("mod_reference", modReference), slog.String("version", version), slog.String("link", link)) - reader, size, err := cache.DownloadOrCache(modReference+"_"+version+".zip", hash, link, downloadUpdates, downloadSemaphore) + reader, size, err := cache.DownloadOrCache(modReference+"_"+version+"_"+target+".zip", hash, link, downloadUpdates, downloadSemaphore) if err != nil { return fmt.Errorf("failed to download %s from: %s: %w", modReference, link, err) }