downloader: download captions

README.md

@@ -400,7 +400,8 @@ $ annie -j https://www.bilibili.com/video/av20203945
 ```console
 $ annie -h
 
-Usage of annie:
+Usage of ./annie:
+  -C	Download captions
   -F string
     	URLs file
   -O string

config/config.go

@@ -35,6 +35,8 @@ var (
 	PlaylistEnd int
 	// PlaylistItems Playlist video items to download. Separated by commas like: 1,5,6
 	PlaylistItems string
+	// Caption download captions
+	Caption bool
 )
 
 // FakeHeaders fake http headers

downloader/downloader.go

@@ -46,6 +46,14 @@ type VideoData struct {
 	Formats map[string]FormatData
 }
 
+func progressBar(size int64) *pb.ProgressBar {
+	bar := pb.New64(size).SetUnits(pb.U_BYTES).SetRefreshRate(time.Millisecond * 10)
+	bar.ShowSpeed = true
+	bar.ShowFinalTime = true
+	bar.SetMaxWidth(1000)
+	return bar
+}
+
 func (data *FormatData) calculateTotalSize() {
 	var size int64
 	for _, urlData := range data.URLs {
@@ -54,15 +62,35 @@ func (data *FormatData) calculateTotalSize() {
 	data.Size = size
 }
 
-// urlSave save url file
-func (data FormatData) urlSave(
+// Caption download danmaku, subtitles, etc
+func Caption(url, refer, fileName, ext string) {
+	if !config.Caption || config.InfoOnly {
+		return
+	}
+	fmt.Println("\nDownloading captions...")
+	body := request.Get(url, refer, nil)
+	filePath := utils.FilePath(fileName, ext, false)
+	file, fileError := os.Create(filePath)
+	if fileError != nil {
+		log.Fatal(fileError)
+	}
+	defer file.Close()
+	file.WriteString(body)
+}
+
+// Save save url file
+func Save(
 	urlData URLData, refer, fileName string, bar *pb.ProgressBar,
 ) {
 	filePath := utils.FilePath(fileName, urlData.Ext, false)
 	fileSize, exists := utils.FileSize(filePath)
+	if bar == nil {
+		bar = progressBar(urlData.Size)
+		bar.Start()
+	}
 	// Skip segment file
 	// TODO: Live video URLs will not return the size
-	if fileSize == urlData.Size {
+	if exists && fileSize == urlData.Size {
 		fmt.Printf("%s: file already exists, skipping\n", filePath)
 		bar.Add64(fileSize)
 		return
@@ -201,14 +229,11 @@ func (v VideoData) Download(refer string) {
 		fmt.Printf("%s: file already exists, skipping\n", mergedFilePath)
 		return
 	}
-	bar := pb.New64(data.Size).SetUnits(pb.U_BYTES).SetRefreshRate(time.Millisecond * 10)
-	bar.ShowSpeed = true
-	bar.ShowFinalTime = true
-	bar.SetMaxWidth(1000)
+	bar := progressBar(data.Size)
 	bar.Start()
 	if len(data.URLs) == 1 {
 		// only one fragment
-		data.urlSave(data.URLs[0], refer, title, bar)
+		Save(data.URLs[0], refer, title, bar)
 		bar.Finish()
 		return
 	}
@@ -223,7 +248,7 @@ func (v VideoData) Download(refer string) {
 		wgp.Add()
 		go func(url URLData, refer, fileName string, bar *pb.ProgressBar) {
 			defer wgp.Done()
-			data.urlSave(url, refer, fileName, bar)
+			Save(url, refer, fileName, bar)
 		}(url, refer, partFileName, bar)
 
 	}

extractors/bilibili/bilibili.go

@@ -249,12 +249,17 @@ func bilibiliDownload(url string, options bilibiliOptions) downloader.VideoData
 		}
 		title = tempTitle
 	}
+	title = utils.FileName(title)
 	extractedData := downloader.VideoData{
 		Site:    "哔哩哔哩 bilibili.com",
-		Title:   utils.FileName(title),
+		Title:   title,
 		Type:    "video",
 		Formats: format,
 	}
 	extractedData.Download(url)
+	downloader.Caption(
+		fmt.Sprintf("https://comment.bilibili.com/%s.xml", cid),
+		url, title, "xml",
+	)
 	return extractedData
 }

main.go

@@ -36,6 +36,7 @@ func init() {
 		&config.PlaylistItems, "items", "",
 		"Playlist video items to download. Separated by commas like: 1,5,6",
 	)
+	flag.BoolVar(&config.Caption, "C", false, "Download captions")
 }
 
 func download(videoURL string) {

request/request.go

@@ -1,8 +1,8 @@
 package request
 
 import (
+	"compress/flate"
 	"compress/gzip"
-	"compress/zlib"
 	"crypto/tls"
 	"fmt"
 	"io"
@@ -133,7 +133,7 @@ func Get(url, refer string, headers map[string]string) string {
 	case "gzip":
 		reader, _ = gzip.NewReader(res.Body)
 	case "deflate":
-		reader, _ = zlib.NewReader(res.Body)
+		reader = flate.NewReader(res.Body)
 	default:
 		reader = res.Body
 	}