feat: add process bar during dtm upgrade

internal/pkg/pluginmanager/pbdownloader.go

@@ -5,14 +5,12 @@ package pluginmanager
 
 import (
 	"fmt"
-	"io"
 	"net/http"
 	"os"
 	"path/filepath"
-	"strconv"
 	"time"
 
-	"github.com/cheggaaa/pb"
+	"github.com/devstream-io/devstream/pkg/util/downloader"
 
 	"github.com/devstream-io/devstream/pkg/util/log"
 )
@@ -60,7 +58,7 @@ func (pd *PbDownloadClient) download(pluginsDir, pluginFilename, version string)
 
 		defer downFile.Close()
 		// create progress bar when reading response body
-		errSetup := setUpProgressBar(resp, downFile)
+		_, errSetup := downloader.SetUpProgressBar(resp, downFile)
 		if errSetup != nil {
 			log.Error(errSetup)
 			return errSetup
@@ -81,31 +79,6 @@ func (pd *PbDownloadClient) download(pluginsDir, pluginFilename, version string)
 	return nil
 }
 
-// setUpProgressBar create bar and setup
-func setUpProgressBar(resp *http.Response, downFile *os.File) error {
-	//get size
-	i, _ := strconv.Atoi(resp.Header.Get("Content-Length"))
-	sourceSiz := int64(i)
-	source := resp.Body
-
-	//create a bar and set param
-	bar := pb.New(int(sourceSiz)).SetRefreshRate(time.Millisecond * 10).SetUnits(pb.U_BYTES).SetWidth(100)
-	bar.ShowSpeed = true
-	bar.ShowTimeLeft = true
-	bar.ShowFinalTime = true
-	bar.SetWidth(80)
-	bar.Start()
-
-	writer := io.MultiWriter(downFile, bar)
-	_, err := io.Copy(writer, source)
-	if err != nil {
-		log.Error(err)
-		return err
-	}
-	bar.Finish()
-	return nil
-}
-
 func createPathIfNotExists(path string) error {
 	_, err := os.Stat(path)
 	if !os.IsNotExist(err) {

pkg/util/downloader/downloader.go

@@ -1,12 +1,15 @@
 package downloader
 
 import (
-	"bytes"
 	"fmt"
 	"io"
 	"net/http"
 	"os"
 	"path/filepath"
+	"strconv"
+	"time"
+
+	"github.com/cheggaaa/pb"
 
 	"github.com/devstream-io/devstream/pkg/util/log"
 )
@@ -39,11 +42,7 @@ func Download(url, filename, targetDir string) (int64, error) {
 			log.Debugf("download create file failed: %s", err)
 		}
 	}()
-	content, err := FetchContentFromURL(url)
-	if err != nil {
-		return 0, err
-	}
-	return io.Copy(f, bytes.NewBuffer(content))
+	return FetchContentFromURLAndSetUpProgressBar(url, f)
 }
 
 func FetchContentFromURL(url string) ([]byte, error) {
@@ -67,3 +66,43 @@ func FetchContentFromURL(url string) ([]byte, error) {
 
 	return io.ReadAll(resp.Body)
 }
+
+// setUpProgressBar create bar and setup
+func SetUpProgressBar(resp *http.Response, downFile io.Writer) (int64, error) {
+	//get size
+	i, _ := strconv.Atoi(resp.Header.Get("Content-Length"))
+	sourceSiz := int64(i)
+	source := resp.Body
+
+	//create a bar and set param
+	bar := pb.New(int(sourceSiz)).SetRefreshRate(time.Millisecond * 10).SetUnits(pb.U_BYTES).SetWidth(100)
+	bar.ShowSpeed = true
+	bar.ShowTimeLeft = true
+	bar.ShowFinalTime = true
+	bar.SetWidth(80)
+	bar.Start()
+	defer bar.Finish()
+	writer := io.MultiWriter(downFile, bar)
+	return io.Copy(writer, source)
+}
+
+func FetchContentFromURLAndSetUpProgressBar(url string, dst io.Writer) (int64, error) {
+	resp, err := http.Get(url)
+
+	// check response error
+	if err != nil {
+		log.Debugf("Download from url failed: %s", err)
+		return 0, err
+	}
+	defer func(body io.ReadCloser) {
+		err := body.Close()
+		if err != nil {
+			log.Errorf("Close response body failed: %s", err)
+		}
+	}(resp.Body)
+
+	if resp.StatusCode != http.StatusOK {
+		return 0, fmt.Errorf("Download file from url failed: %+v", resp)
+	}
+	return SetUpProgressBar(resp, dst)
+}