From 3669d38491ed0373947673f2f5d15d02565fa02b Mon Sep 17 00:00:00 2001
From: orestonce <orestonce@163.com>
Date: Tue, 9 Aug 2022 09:25:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=91=BD=E4=BB=A4=E8=A1=8C?=
 =?UTF-8?q?=E4=B8=8B=E4=B8=8D=E6=98=BE=E7=A4=BA=E8=BF=9B=E5=BA=A6=E6=9D=A1?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cmd/main.go |  2 +-
 download.go | 13 ++-----------
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/cmd/main.go b/cmd/main.go
index ba05527..c0ea8e2 100644
--- a/cmd/main.go
+++ b/cmd/main.go
@@ -22,7 +22,7 @@ var downloadCmd = &cobra.Command{
 }
 
 func downloadFromCmd(req m3u8d.RunDownload_Req) {
-	m3u8d.SetShowProgressBar()
+	req.ProgressBarShow = true
 	resp := m3u8d.RunDownload(req)
 	fmt.Println() // 有进度条,所以需要换行
 	if resp.ErrMsg != "" {
diff --git a/download.go b/download.go
index c82f05d..d5eb519 100644
--- a/download.go
+++ b/download.go
@@ -85,6 +85,7 @@ type RunDownload_Req struct {
 	SetProxy            string
 	HeaderMap           map[string][]string
 	SkipRemoveTs        bool
+	ProgressBarShow     bool
 }
 
 type downloadEnv struct {
@@ -291,6 +292,7 @@ func RunDownload(req RunDownload_Req) (resp RunDownload_Resp) {
 			},
 		},
 		speedBytesMap: map[time.Time]int64{},
+		progressBarShow: req.ProgressBarShow,
 	}
 	env.ctx, env.cancelFn = context.WithCancel(context.Background())
 
@@ -493,17 +495,6 @@ func (this *downloadEnv) downloader(tsList []TsInfo, downloadDir string, key str
 	return err
 }
 
-func SetShowProgressBar() {
-	gOldEnvLocker.Lock()
-	tmp := gOldEnv
-	gOldEnvLocker.Unlock()
-	if tmp != nil {
-		tmp.progressLocker.Lock()
-		tmp.progressBarShow = true
-		tmp.progressLocker.Unlock()
-	}
-}
-
 // 进度条
 func (this *downloadEnv) DrawProgressBar(total int, current int) {
 	if total == 0 {