Merge pull request #41 from Code-Hex/fix/somecode

Code-Hex · web-flow · commit 8022cf74aac8 · 2022-01-05T00:51:04.000+09:00
fixed somecode
diff --git a/client.go b/client.go
@@ -18,7 +18,6 @@ func newDownloadClient(maxIdleConnsPerHost int) *http.Client {
 	tr.MaxIdleConns = 0 // no limit
 	tr.MaxIdleConnsPerHost = maxIdleConnsPerHost
 	tr.DisableCompression = true
-	tr.ForceAttemptHTTP2 = false
 	return &http.Client{
 		Transport: tr,
 	}
diff --git a/download.go b/download.go
@@ -189,9 +189,16 @@ type parallelDownloadConfig struct {
 func parallelDownload(ctx context.Context, c *parallelDownloadConfig) error {
 	eg, ctx := errgroup.WithContext(ctx)
 
-	eg.Go(func() error {
-		return progressBar(ctx, c.ContentLength, c.PartialDir)
-	})
+	bar := pb.Start64(c.ContentLength).SetWriter(stdout).Set(pb.Bytes, true)
+	defer bar.Finish()
+
+	// check file size already downloaded for resume
+	size, err := checkProgress(c.PartialDir)
+	if err != nil {
+		return errors.Wrap(err, "failed to get directory size")
+	}
+
+	bar.SetCurrent(size)
 
 	for _, task := range c.Tasks {
 		task := task
@@ -200,14 +207,14 @@ func parallelDownload(ctx context.Context, c *parallelDownloadConfig) error {
 			if err != nil {
 				return err
 			}
-			return task.download(req)
+			return task.download(req, bar)
 		})
 	}
 
 	return eg.Wait()
 }
 
-func (t *task) download(req *http.Request) error {
+func (t *task) download(req *http.Request, bar *pb.ProgressBar) error {
 	resp, err := t.Client.Do(req)
 	if err != nil {
 		return errors.Wrapf(err, "failed to get response: %q", t.String())
@@ -220,7 +227,9 @@ func (t *task) download(req *http.Request) error {
 	}
 	defer output.Close()
 
-	if _, err := io.Copy(output, resp.Body); err != nil {
+	rd := bar.NewProxyReader(resp.Body)
+
+	if _, err := io.Copy(output, rd); err != nil {
 		return errors.Wrapf(err, "failed to write response body: %q", t.String())
 	}
 
diff --git a/util.go b/util.go
@@ -1,14 +1,9 @@
 package pget
 
 import (
-	"context"
 	"fmt"
 	"os"
 	"path/filepath"
-	"time"
-
-	"github.com/cheggaaa/pb/v3"
-	"github.com/pkg/errors"
 )
 
 func getPartialDirname(targetDir, filename string, procs int) string {
@@ -52,27 +47,3 @@ func makeRange(i, procs int, rangeSize, contentLength int64) Range {
 func (r Range) BytesRange() string {
 	return fmt.Sprintf("bytes=%d-%d", r.low, r.high)
 }
-
-func progressBar(ctx context.Context, contentLength int64, dirname string) error {
-	bar := pb.Start64(contentLength).SetWriter(stdout).Set(pb.Bytes, true)
-	defer bar.Finish()
-
-	for {
-		select {
-		case <-ctx.Done():
-			return nil
-		case <-time.After(100 * time.Millisecond): // To save cpu resource
-			size, err := checkProgress(dirname)
-			if err != nil {
-				return errors.Wrap(err, "failed to get directory size")
-			}
-
-			if size < contentLength {
-				bar.SetCurrent(size)
-			} else {
-				bar.SetCurrent(contentLength)
-				return nil
-			}
-		}
-	}
-}

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,6 @@ func newDownloadClient(maxIdleConnsPerHost int) *http.Client {`
`18`	`18`	`tr.MaxIdleConns = 0 // no limit`
`19`	`19`	`tr.MaxIdleConnsPerHost = maxIdleConnsPerHost`
`20`	`20`	`tr.DisableCompression = true`
`21`		`- tr.ForceAttemptHTTP2 = false`
`22`	`21`	`return &http.Client{`
`23`	`22`	`Transport: tr,`
`24`	`23`	`}`