fix upload

Author: JojiiOfficial

commands/FileDownload.go

@@ -158,16 +158,7 @@ func (cData *CommandData) DownloadFile(data *DownloadData) {
 		// await shredder
 		<-c
 	}, func(s string) {
-		text := sPrintSuccess("saved '%s'", outFile)
-
-		// If a progressbar was used, set its text
-		// instead of printing a new line
-		if data.bar != nil {
-			data.bar.SetText(text)
-		} else {
-			fmt.Println(text + "\n")
-		}
-
+		printBar(sPrintSuccess("saved '%s'", outFile), data.bar)
 	})
 }
 
@@ -184,13 +175,3 @@ func writeFile(cData *CommandData, resp *libdm.FileDownloadResponse, file string
 
 	return err
 }
-
-// If bar is set, use it to print text
-// Otherwise print a new line
-func printBar(text string, bar *uiprogress.Bar) {
-	if bar == nil {
-		fmt.Println(text)
-	} else {
-		bar.SetText(text)
-	}
-}

commands/FileUtils.go

@@ -14,6 +14,7 @@ import (
 	libdm "github.com/DataManager-Go/libdatamanager"
 	"github.com/JojiiOfficial/gaw"
 	"github.com/fatih/color"
+	"github.com/gosuri/uiprogress"
 )
 
 // determineDecryptionKey  gets the correct decryption key from either the arguments of
@@ -156,3 +157,13 @@ func parseURIArgUploadCommand(uris []string) []string {
 
 	return newURIList
 }
+
+// If bar is set, use it to print text
+// Otherwise print a new line
+func printBar(text string, bar *uiprogress.Bar) {
+	if bar.IsValid() {
+		bar.SetText(text)
+	} else {
+		fmt.Println(text)
+	}
+}

go.mod

@@ -2,7 +2,7 @@ module github.com/DataManager-Go/DataManagerCLI
 
 go 1.14
 
-replace github.com/gosuri/uiprogress v0.0.1 => github.com/JojiiOfficial/uiprogress v1.0.4
+replace github.com/gosuri/uiprogress v0.0.1 => github.com/JojiiOfficial/uiprogress v1.0.5
 
 require (
 	github.com/CovenantSQL/go-sqlite3-encrypt v1.9.0

go.sum

@@ -21,6 +21,8 @@ github.com/JojiiOfficial/uiprogress v1.0.3 h1:FeSJKEPlfyUokrA4zi/hl6s3m2DAHdo8TX
 github.com/JojiiOfficial/uiprogress v1.0.3/go.mod h1:MsdctZCVERbGDu5lcgHZY12ANTIWkUjk7JyqGSTmQYg=
 github.com/JojiiOfficial/uiprogress v1.0.4 h1:2YL/YX6QoB5twDt2sK9cry5V277S5e9dEGzKelgOnGc=
 github.com/JojiiOfficial/uiprogress v1.0.4/go.mod h1:MsdctZCVERbGDu5lcgHZY12ANTIWkUjk7JyqGSTmQYg=
+github.com/JojiiOfficial/uiprogress v1.0.5 h1:aDvOcDRwXfDk6tsx6TmnjK3IAsbhzjJ3hZ4BpBZtotE=
+github.com/JojiiOfficial/uiprogress v1.0.5/go.mod h1:MsdctZCVERbGDu5lcgHZY12ANTIWkUjk7JyqGSTmQYg=
 github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 h1:JYp7IbQjafoB+tBA3gMyHYHrpOtNuDiK/uB5uXxq5wM=
 github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d h1:UQZhZ2O0vMHr2cI+DC1Mbh0TJxzA3RcLoMsFw+aXw7E=