parent
16e656fbed
commit
3669d38491
|
|
@ -22,7 +22,7 @@ var downloadCmd = &cobra.Command{
|
||||||
}
|
}
|
||||||
|
|
||||||
func downloadFromCmd(req m3u8d.RunDownload_Req) {
|
func downloadFromCmd(req m3u8d.RunDownload_Req) {
|
||||||
m3u8d.SetShowProgressBar()
|
req.ProgressBarShow = true
|
||||||
resp := m3u8d.RunDownload(req)
|
resp := m3u8d.RunDownload(req)
|
||||||
fmt.Println() // 有进度条,所以需要换行
|
fmt.Println() // 有进度条,所以需要换行
|
||||||
if resp.ErrMsg != "" {
|
if resp.ErrMsg != "" {
|
||||||
|
|
|
||||||
13
download.go
13
download.go
|
|
@ -85,6 +85,7 @@ type RunDownload_Req struct {
|
||||||
SetProxy string
|
SetProxy string
|
||||||
HeaderMap map[string][]string
|
HeaderMap map[string][]string
|
||||||
SkipRemoveTs bool
|
SkipRemoveTs bool
|
||||||
|
ProgressBarShow bool
|
||||||
}
|
}
|
||||||
|
|
||||||
type downloadEnv struct {
|
type downloadEnv struct {
|
||||||
|
|
@ -291,6 +292,7 @@ func RunDownload(req RunDownload_Req) (resp RunDownload_Resp) {
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
speedBytesMap: map[time.Time]int64{},
|
speedBytesMap: map[time.Time]int64{},
|
||||||
|
progressBarShow: req.ProgressBarShow,
|
||||||
}
|
}
|
||||||
env.ctx, env.cancelFn = context.WithCancel(context.Background())
|
env.ctx, env.cancelFn = context.WithCancel(context.Background())
|
||||||
|
|
||||||
|
|
@ -493,17 +495,6 @@ func (this *downloadEnv) downloader(tsList []TsInfo, downloadDir string, key str
|
||||||
return err
|
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) {
|
func (this *downloadEnv) DrawProgressBar(total int, current int) {
|
||||||
if total == 0 {
|
if total == 0 {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue