refactor download

get rid of goto

e2e/docker-compose.yml

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

sources/youtubeVideo.go

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