LBRYCommunity/ytsync
1
0
Fork 0
Code Issues 39 Pull requests 8 Projects Releases 197 Packages Wiki Activity

don't retry missing fragments

Browse source 
lower syncing quality for now
This commit is contained in:
Niko Storni 2019-07-22 02:09:18 +02:00
parent 60f2585f33
commit 1760935edf
1 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
sources/youtubeVideo.go
View file

@ -190,16 +190,25 @@ func (v *YoutubeVideo) download(useIPv6 bool) error {
log.Debugln(v.id + " already exists at " + videoPath) log.Debugln(v.id + " already exists at " + videoPath)
return nil return nil
} }
qualities := []string{
//"1080",
"720",
"480",
"320",
}
qualityIndex := 0
ytdlArgs := []string{ ytdlArgs := []string{
"--no-progress", "--no-progress",
"--max-filesize", "--max-filesize",
fmt.Sprintf("%dM", v.maxVideoSize), fmt.Sprintf("%dM", v.maxVideoSize),
"--match-filter", "--match-filter",
fmt.Sprintf("duration <= %d", int(math.Round(v.maxVideoLength*3600))), fmt.Sprintf("duration <= %d", int(math.Round(v.maxVideoLength*3600))),
"-fbestvideo[ext=mp4][height<=1080]+bestaudio[ext!=webm]", "-fbestvideo[ext=mp4][height<=" + qualities[qualityIndex] + "]+bestaudio[ext!=webm]",
"-o" + strings.TrimSuffix(v.getFullPath(), ".mp4"), "-o" + strings.TrimSuffix(v.getFullPath(), ".mp4"),
"--merge-output-format", "--merge-output-format",
"--abort-on-unavailable-fragment",
"--fragment-retries",
"0",
"mp4", "mp4",
} }
sourceAddress, err := ipManager.GetNextIP(useIPv6) sourceAddress, err := ipManager.GetNextIP(useIPv6)
@ -239,6 +248,7 @@ func (v *YoutubeVideo) download(useIPv6 bool) error {
) )
} }
ytdlArgs = append(ytdlArgs, "https://www.youtube.com/watch?v="+v.ID()) ytdlArgs = append(ytdlArgs, "https://www.youtube.com/watch?v="+v.ID())
runcmd:
cmd := exec.Command("youtube-dl", ytdlArgs...) cmd := exec.Command("youtube-dl", ytdlArgs...)
log.Printf("Running command and waiting for it to finish...") log.Printf("Running command and waiting for it to finish...")
@ -265,6 +275,9 @@ func (v *YoutubeVideo) download(useIPv6 bool) error {
ipManager.SetIpThrottled(sourceAddress, v.stopGroup) ipManager.SetIpThrottled(sourceAddress, v.stopGroup)
} }
return errors.Err(string(errorLog)) return errors.Err(string(errorLog))
} else if strings.Contains(string(errorLog), "giving up after 0 fragment retries") && qualityIndex < len(qualities)-1 {
qualityIndex++
goto runcmd
} }
return errors.Err(err) return errors.Err(err)
} }