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

refactor download

Browse source 
get rid of goto
This commit is contained in:
Niko Storni 2019-12-20 18:49:33 +01:00
parent b6861dae9b
commit a5657aaf46
2 changed files with 67 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
e2e/docker-compose.yml
View file

@ -21,7 +21,7 @@ services:
## Wallet Server ## ## Wallet Server ##
################### ###################
walletserver: walletserver:
image: lbry/wallet-server:v0.48.1 image: lbry/wallet-server:v0.50.1
restart: always restart: always
environment: environment:
- DB_DIRECTORY=/database - DB_DIRECTORY=/database

41
sources/youtubeVideo.go
View file

@ -199,7 +199,6 @@ func (v *YoutubeVideo) download() error {
"480", "480",
"320", "320",
} }
qualityIndex := 0
ytdlArgs := []string{ ytdlArgs := []string{
"--no-progress", "--no-progress",
"-o" + strings.TrimSuffix(v.getFullPath(), ".mp4"), "-o" + strings.TrimSuffix(v.getFullPath(), ".mp4"),
@ -224,39 +223,35 @@ func (v *YoutubeVideo) download() error {
) )
} }
sourceAddress, err := v.pool.GetIP(v.id) var sourceAddress string
if err != nil {
if sourceAddress == "throttled" {
for { for {
sourceAddress, err = v.pool.GetIP(v.id)
if err != nil {
if errors.Is(err, ip_manager.ErrAllThrottled) {
select { select {
case <-v.stopGroup.Ch(): case <-v.stopGroup.Ch():
return errors.Err("interrupted by user") return errors.Err("interrupted by user")
default: default:
}
time.Sleep(ip_manager.IPCooldownPeriod) time.Sleep(ip_manager.IPCooldownPeriod)
sourceAddress, err = v.pool.GetIP(v.id) continue
if err == nil { }
break } else {
} else if !errors.Is(err, ip_manager.ErrAllThrottled) {
return err return err
} }
} }
} else { break
return errors.Err(err)
}
} }
defer v.pool.ReleaseIP(sourceAddress) defer v.pool.ReleaseIP(sourceAddress)
ytdlArgs = append(ytdlArgs, ytdlArgs = append(ytdlArgs,
"--source-address", "--source-address",
sourceAddress, sourceAddress,
"https://www.youtube.com/watch?v="+v.ID(), "https://www.youtube.com/watch?v="+v.ID(),
) )
runcmd: for i, quality := range qualities {
argsWithFilters := append(ytdlArgs, "-fbestvideo[ext=mp4][height<="+qualities[qualityIndex]+"]+bestaudio[ext!=webm]") argsWithFilters := append(ytdlArgs, "-fbestvideo[ext=mp4][height<="+quality+"]+bestaudio[ext!=webm]")
cmd := exec.Command("youtube-dl", argsWithFilters...) cmd := exec.Command("youtube-dl", argsWithFilters...)
log.Printf("Running command youtube-dl %s", strings.Join(argsWithFilters, " ")) log.Printf("Running command youtube-dl %s", strings.Join(argsWithFilters, " "))
stderr, err := cmd.StderrPipe() stderr, err := cmd.StderrPipe()
@ -274,14 +269,16 @@ runcmd:
errorLog, _ := ioutil.ReadAll(stderr) errorLog, _ := ioutil.ReadAll(stderr)
outLog, _ := ioutil.ReadAll(stdout) outLog, _ := ioutil.ReadAll(stdout)
err = cmd.Wait()
if err = cmd.Wait(); err != nil { if err != nil {
if strings.Contains(err.Error(), "exit status 1") { if strings.Contains(err.Error(), "exit status 1") {
if strings.Contains(string(errorLog), "HTTP Error 429") || strings.Contains(string(errorLog), "returned non-zero exit status 8") { if strings.Contains(string(errorLog), "HTTP Error 429") || strings.Contains(string(errorLog), "returned non-zero exit status 8") {
v.pool.SetThrottled(sourceAddress) v.pool.SetThrottled(sourceAddress)
} else if strings.Contains(string(errorLog), "giving up after 0 fragment retries") && qualityIndex < len(qualities)-1 { } else if strings.Contains(string(errorLog), "giving up after 0 fragment retries") {
qualityIndex++ if i == (len(qualities) - 1) {
goto runcmd //this bypasses the yt throttling IP redistribution... TODO: don't return errors.Err(string(errorLog))
}
continue //this bypasses the yt throttling IP redistribution... TODO: don't
} }
return errors.Err(string(errorLog)) return errors.Err(string(errorLog))
} }
@ -312,6 +309,8 @@ runcmd:
} }
videoSize := fi.Size() videoSize := fi.Size()
v.size = &videoSize v.size = &videoSize
break
}
return nil return nil
} }