修复命令行下不显示进度条的问题

main v1.5.14
orestonce 2022-08-09 09:25:30 +08:00
parent 16e656fbed
commit 3669d38491
2 changed files with 3 additions and 12 deletions

View File

@ -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 != "" {

View File

@ -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 {