From c07835fab313d758d592916a2a236d13bc01292b Mon Sep 17 00:00:00 2001 From: marco Date: Mon, 22 Apr 2024 12:43:27 +0200 Subject: [PATCH] pass url to Download(), not constructor --- pkg/cwhub/dataset.go | 4 ++-- pkg/cwhub/itemupgrade.go | 4 ++-- pkg/cwhub/remote.go | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/cwhub/dataset.go b/pkg/cwhub/dataset.go index 686463ccc..eb56d8e32 100644 --- a/pkg/cwhub/dataset.go +++ b/pkg/cwhub/dataset.go @@ -42,7 +42,7 @@ func downloadDataSet(dataFolder string, force bool, reader io.Reader, logger *lo } d := downloader. - New(dataS.SourceURL). + New(). WithHTTPClient(hubClient). ToFile(destPath). CompareContent(). @@ -55,7 +55,7 @@ func downloadDataSet(dataFolder string, force bool, reader io.Reader, logger *lo ctx := context.TODO() - downloaded, err := d.Download(ctx) + downloaded, err := d.Download(ctx, dataS.SourceURL) if err != nil { return fmt.Errorf("while getting data: %w", err) } diff --git a/pkg/cwhub/itemupgrade.go b/pkg/cwhub/itemupgrade.go index 838efb0b6..8b3ec7481 100644 --- a/pkg/cwhub/itemupgrade.go +++ b/pkg/cwhub/itemupgrade.go @@ -121,7 +121,7 @@ func (i *Item) FetchContentTo(destPath string) (bool, string, error) { } d := downloader. - New(url). + New(). WithHTTPClient(hubClient). ToFile(destPath). WithMakeDirs(true). @@ -133,7 +133,7 @@ func (i *Item) FetchContentTo(destPath string) (bool, string, error) { ctx := context.TODO() - downloaded, err := d.Download(ctx) + downloaded, err := d.Download(ctx, url) if err != nil { return false, "", fmt.Errorf("while downloading %s to %s: %w", i.Name, url, err) } diff --git a/pkg/cwhub/remote.go b/pkg/cwhub/remote.go index 04bfa816e..5e42555fa 100644 --- a/pkg/cwhub/remote.go +++ b/pkg/cwhub/remote.go @@ -44,12 +44,12 @@ func (r *RemoteHubCfg) fetchIndex(destPath string) (bool, error) { ctx := context.TODO() downloaded, err := downloader. - New(url). + New(). WithHTTPClient(hubClient). ToFile(destPath). CompareContent(). WithLogger(logrus.WithFields(logrus.Fields{"url": url})). - Download(ctx) + Download(ctx, url) if err != nil { return false, err }