Merge branch 'DownloadHelper_SSS' into 'master'

Download Helper Changes

See merge request !27

downloadhelper/downloadHelper.go

@@ -2,7 +2,6 @@ package downloadhelper
 
 import (
 	"errors"
-	"os"
 	"strings"
 	"time"
 
@@ -34,27 +33,33 @@ func DownloadFile(sourcePath, destinationPath, jwtToken string, retryCnt int) (b
 	var resp *grab.Response
 	for index := 1; index <= retryCnt; index++ {
 		resp = client.Do(req)
-		t := time.NewTicker(200 * time.Millisecond)
-		defer t.Stop()
-
-	Loop:
-		for {
-			select {
-			// case <-t.C:
-			// 	logginghelper.LogInfo("  transferred %v / %v bytes (%.2f%%)\n",
-			// 		resp.BytesComplete(),
-			// 		resp.Size,
-			// 		100*resp.Progress())
-
-			case <-resp.Done:
-				// download is complete
-				break Loop
-			}
+		if resp.Size <= 0 {
+			t := time.NewTicker(200 * time.Millisecond)
+			defer t.Stop()
+			continue
 		}
 
+		// t := time.NewTicker(200 * time.Millisecond)
+		// defer t.Stop()
+
+		// Loop:
+		// 	for {
+		// 		select {
+		// 		// case <-t.C:
+		// 		// 	logginghelper.LogInfo("  transferred %v / %v bytes (%.2f%%)\n",
+		// 		// 		resp.BytesComplete(),
+		// 		// 		resp.Size,
+		// 		// 		100*resp.Progress())
+
+		// 		case <-resp.Done:
+		// 			// download is complete
+		// 			break Loop
+		// 		}
+		// 	}
+
 		// check for errors
 		if err := resp.Err(); err != nil {
-			logginghelper.LogError(os.Stderr, "Download failed: %v\n", err)
+			logginghelper.LogError("Download failed: %v\n", err)
 			return false, errors.New("File not found on cloud")
 		}
 
@@ -62,16 +67,20 @@ func DownloadFile(sourcePath, destinationPath, jwtToken string, retryCnt int) (b
 		//resp, err = grab.Get(destinationPath, sourcePath)
 		if resp.HTTPResponse != nil && (resp.HTTPResponse.StatusCode == 200 || resp.HTTPResponse.StatusCode == 206) {
 			return true, nil
-		} else {
-			err := filehelper.DeleteFile(destinationPath)
-			if err != nil {
-				logginghelper.LogError("Error in deleting file \n : ", destinationPath, err)
-				return false, err
-			}
-			return false, nil
 		}
+		err := filehelper.DeleteFile(destinationPath)
+		if err != nil {
+			logginghelper.LogError("Error in deleting file \n : ", destinationPath, err)
+			return false, err
+		}
+		return false, nil
 
 	}
+	err := filehelper.DeleteFile(destinationPath)
+	if err != nil {
+		logginghelper.LogError("Error in deleting file \n : ", destinationPath, err)
+		return false, err
+	}
 	return false, errors.New("File not found on cloud")
 }