Skip to content

Commit dd00f6d

Browse files
ilvsxilvsxk
andauthored
feat: export Bar field for progress tracking (#1434)
Co-authored-by: ilvsxk <ilvsx@gmail.com>
1 parent 3d84b49 commit dd00f6d

1 file changed

Lines changed: 11 additions & 11 deletions

File tree

downloader/downloader.go

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ type Options struct {
5050

5151
// Downloader is the default downloader.
5252
type Downloader struct {
53-
bar *pb.ProgressBar
53+
Bar *pb.ProgressBar
5454
option Options
5555
}
5656

@@ -115,7 +115,7 @@ func (downloader *Downloader) writeFile(url string, file *os.File, headers map[s
115115
}
116116
defer res.Body.Close() // nolint
117117

118-
barWriter := downloader.bar.NewProxyWriter(file)
118+
barWriter := downloader.Bar.NewProxyWriter(file)
119119
// Note that io.Copy reads 32kb(maximum) from input and writes them to output, then repeats.
120120
// So don't worry about memory.
121121
written, copyErr := io.Copy(barWriter, res.Body)
@@ -137,7 +137,7 @@ func (downloader *Downloader) save(part *extractors.Part, refer, fileName string
137137
// Skip segment file
138138
// TODO: Live video URLs will not return the size
139139
if exists && fileSize == part.Size {
140-
downloader.bar.Add64(fileSize)
140+
downloader.Bar.Add64(fileSize)
141141
return nil
142142
}
143143

@@ -157,7 +157,7 @@ func (downloader *Downloader) save(part *extractors.Part, refer, fileName string
157157
// range start from 0, 0-1023 means the first 1024 bytes of the file
158158
headers["Range"] = fmt.Sprintf("bytes=%d-", tempFileSize)
159159
file, fileError = os.OpenFile(tempFilePath, os.O_APPEND|os.O_WRONLY, 0644)
160-
downloader.bar.Add64(tempFileSize)
160+
downloader.Bar.Add64(tempFileSize)
161161
} else {
162162
file, fileError = os.Create(tempFilePath)
163163
}
@@ -236,7 +236,7 @@ func (downloader *Downloader) multiThreadSave(dataPart *extractors.Part, refer,
236236
// Skip segment file
237237
// TODO: Live video URLs will not return the size
238238
if exists && fileSize == dataPart.Size {
239-
downloader.bar.Add64(fileSize)
239+
downloader.Bar.Add64(fileSize)
240240
return nil
241241
}
242242
tmpFilePath := filePath + DOWNLOAD_FILE_EXT
@@ -246,7 +246,7 @@ func (downloader *Downloader) multiThreadSave(dataPart *extractors.Part, refer,
246246
}
247247
if tmpExists {
248248
if tmpFileSize == dataPart.Size {
249-
downloader.bar.Add64(dataPart.Size)
249+
downloader.Bar.Add64(dataPart.Size)
250250
return os.Rename(tmpFilePath, filePath)
251251
}
252252

@@ -331,7 +331,7 @@ func (downloader *Downloader) multiThreadSave(dataPart *extractors.Part, refer,
331331
}
332332
}
333333
if savedSize > 0 {
334-
downloader.bar.Add64(savedSize)
334+
downloader.Bar.Add64(savedSize)
335335
if savedSize == dataPart.Size {
336336
return mergeMultiPart(filePath, parts)
337337
}
@@ -653,9 +653,9 @@ func (downloader *Downloader) Download(data *extractors.Data) error {
653653
return nil
654654
}
655655

656-
downloader.bar = progressBar(stream.Size)
656+
downloader.Bar = progressBar(stream.Size)
657657
if !downloader.option.Silent {
658-
downloader.bar.Start()
658+
downloader.Bar.Start()
659659
}
660660
if len(stream.Parts) == 1 {
661661
// only one fragment
@@ -669,7 +669,7 @@ func (downloader *Downloader) Download(data *extractors.Data) error {
669669
if err != nil {
670670
return err
671671
}
672-
downloader.bar.Finish()
672+
downloader.Bar.Finish()
673673

674674
if downloader.option.EmbedSubtitle && len(subtitlePaths) > 0 {
675675
if !downloader.option.Silent {
@@ -726,7 +726,7 @@ func (downloader *Downloader) Download(data *extractors.Data) error {
726726
if len(errs) > 0 {
727727
return errs[0]
728728
}
729-
downloader.bar.Finish()
729+
downloader.Bar.Finish()
730730

731731
if data.Type != extractors.DataTypeVideo || downloader.option.AudioOnly {
732732
return nil

0 commit comments

Comments
 (0)