From 1b54bbb909cd0d141c45d24407f15d7a7ecbd6e6 Mon Sep 17 00:00:00 2001
From: AlteredCoder <AlteredCoder>
Date: Sun, 24 May 2020 19:53:05 +0200
Subject: [PATCH] add data folder parameter to hubMgmt

---
 cmd/crowdsec-cli/backup-restore.go |  2 +-
 cmd/crowdsec-cli/install.go        |  2 +-
 cmd/crowdsec-cli/upgrade.go        |  2 +-
 pkg/cwhub/hubMgmt.go               | 12 ++++++------
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/cmd/crowdsec-cli/backup-restore.go b/cmd/crowdsec-cli/backup-restore.go
index f0509c76f..d6c04cd5b 100644
--- a/cmd/crowdsec-cli/backup-restore.go
+++ b/cmd/crowdsec-cli/backup-restore.go
@@ -24,7 +24,7 @@ func silenceInstallItem(name string, obtype string) (string, error) {
 			if download_only && it.Downloaded && it.UpToDate {
 				return fmt.Sprintf("%s is already downloaded and up-to-date", it.Name), nil
 			}
-			it, err := cwhub.DownloadLatest(it, cwhub.Hubdir, force_install)
+			it, err := cwhub.DownloadLatest(it, cwhub.Hubdir, force_install, config.DataFolder)
 			if err != nil {
 				return "", fmt.Errorf("error while downloading %s : %v", it.Name, err)
 			}
diff --git a/cmd/crowdsec-cli/install.go b/cmd/crowdsec-cli/install.go
index fe90af7bd..f0632c592 100644
--- a/cmd/crowdsec-cli/install.go
+++ b/cmd/crowdsec-cli/install.go
@@ -19,7 +19,7 @@ func InstallItem(name string, obtype string) {
 				log.Warningf("%s is already downloaded and up-to-date", it.Name)
 				return
 			}
-			it, err := cwhub.DownloadLatest(it, cwhub.Hubdir, force_install)
+			it, err := cwhub.DownloadLatest(it, cwhub.Hubdir, force_install, config.DataFolder)
 			if err != nil {
 				log.Fatalf("error while downloading %s : %v", it.Name, err)
 			}
diff --git a/cmd/crowdsec-cli/upgrade.go b/cmd/crowdsec-cli/upgrade.go
index b0c0b9fcc..da0bafc08 100644
--- a/cmd/crowdsec-cli/upgrade.go
+++ b/cmd/crowdsec-cli/upgrade.go
@@ -35,7 +35,7 @@ func UpgradeConfig(ttype string, name string) {
 			log.Infof("%s : up-to-date", v.Name)
 			continue
 		}
-		v, err = cwhub.DownloadLatest(v, cwhub.Hubdir, force_upgrade)
+		v, err = cwhub.DownloadLatest(v, cwhub.Hubdir, force_upgrade, config.DataFolder)
 		if err != nil {
 			log.Fatalf("%s : download failed : %v", v.Name, err)
 		}
diff --git a/pkg/cwhub/hubMgmt.go b/pkg/cwhub/hubMgmt.go
index 3b735963f..56cc0cad8 100644
--- a/pkg/cwhub/hubMgmt.go
+++ b/pkg/cwhub/hubMgmt.go
@@ -613,7 +613,7 @@ func EnableItem(target Item, tdir string, hdir string) (Item, error) {
 	return target, nil
 }
 
-func DownloadLatest(target Item, tdir string, overwrite bool) (Item, error) {
+func DownloadLatest(target Item, tdir string, overwrite bool, dataFolder string) (Item, error) {
 	var err error
 	log.Debugf("Downloading %s %s", target.Type, target.Name)
 	if target.Type == COLLECTIONS {
@@ -626,13 +626,13 @@ func DownloadLatest(target Item, tdir string, overwrite bool) (Item, error) {
 					//recurse as it's a collection
 					if ptrtype == COLLECTIONS {
 						log.Debugf("collection, recurse")
-						HubIdx[ptrtype][p], err = DownloadLatest(val, tdir, overwrite)
+						HubIdx[ptrtype][p], err = DownloadLatest(val, tdir, overwrite, dataFolder)
 						if err != nil {
 							log.Errorf("Encountered error while downloading sub-item %s %s : %s.", ptrtype, p, err)
 							return target, fmt.Errorf("encountered error while downloading %s for %s, abort", val.Name, target.Name)
 						}
 					}
-					HubIdx[ptrtype][p], err = DownloadItem(val, tdir, overwrite)
+					HubIdx[ptrtype][p], err = DownloadItem(val, tdir, overwrite, dataFolder)
 					if err != nil {
 						log.Errorf("Encountered error while downloading sub-item %s %s : %s.", ptrtype, p, err)
 						return target, fmt.Errorf("encountered error while downloading %s for %s, abort", val.Name, target.Name)
@@ -643,17 +643,17 @@ func DownloadLatest(target Item, tdir string, overwrite bool) (Item, error) {
 				}
 			}
 		}
-		target, err = DownloadItem(target, tdir, overwrite)
+		target, err = DownloadItem(target, tdir, overwrite, dataFolder)
 		if err != nil {
 			return target, fmt.Errorf("failed to download item : %s", err)
 		}
 	} else {
-		return DownloadItem(target, tdir, overwrite)
+		return DownloadItem(target, tdir, overwrite, dataFolder)
 	}
 	return target, nil
 }
 
-func DownloadItem(target Item, tdir string, overwrite bool) (Item, error) {
+func DownloadItem(target Item, tdir string, overwrite bool, dataFolder string) (Item, error) {
 
 	/*if user didn't --force, don't overwrite local, tainted, up-to-date files*/
 	if !overwrite {