refactor code

fix bugs
add stub for speed checker

sources/youtubeVideo.go

@@ -13,6 +13,7 @@ import (
 	"strconv"
 	"strings"
 	"sync"
+	"syscall"
 	"time"
 
 	"github.com/abadojack/whatlanggo"
@@ -236,14 +237,14 @@ func (v *YoutubeVideo) download() error {
 		"1080",
 		"720",
 		"480",
-		"320",
+		"360",
 	}
 	dur := time.Duration(v.youtubeInfo.Duration) * time.Second
-	if dur.Hours() > 2 { //for videos longer than 2 hours only sync up to 720p
+	if dur.Hours() > 1 { //for videos longer than 1 hour only sync up to 720p
 		qualities = []string{
 			"720",
 			"480",
-			"320",
+			"360",
 		}
 	}
 
@@ -338,8 +339,106 @@ func (v *YoutubeVideo) download() error {
 		if err := cmd.Start(); err != nil {
 			return errors.Err(err)
 		}
+
+		dlStopGrp := stop.New()
+
 		ticker := time.NewTicker(400 * time.Millisecond)
-		done := make(chan bool, 1)
+		go v.trackProgressBar(argsWithFilters, ticker, metadata, dlStopGrp, sourceAddress)
+
+		//ticker2 := time.NewTicker(10 * time.Second)
+		//v.monitorSlowDownload(ticker, dlStopGrp, sourceAddress, cmd)
+
+		errorLog, _ := ioutil.ReadAll(stderr)
+		outLog, _ := ioutil.ReadAll(stdout)
+		err = cmd.Wait()
+
+		//stop the progress bar
+		ticker.Stop()
+		dlStopGrp.Stop()
+
+		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") {
+					if i == (len(qualities) - 1) {
+						return errors.Err(string(errorLog))
+					}
+					continue //this bypasses the yt throttling IP redistribution... TODO: don't
+				} else if strings.Contains(string(errorLog), "YouTube said: Unable to extract video data") && !strings.Contains(userAgent[1], "Googlebot") {
+					i-- //do not lower quality when trying a different user agent
+					userAgent = []string{downloader.GoogleBotUA}
+					log.Infof("trying different user agent for video %s", v.ID())
+					continue
+				}
+				return errors.Err(string(errorLog))
+			}
+			return errors.Err(err)
+		}
+		log.Debugln(string(outLog))
+
+		if strings.Contains(string(outLog), "does not pass filter duration") {
+			_ = v.delete("does not pass filter duration")
+			return errors.Err("video is too long to process")
+		}
+		if strings.Contains(string(outLog), "File is larger than max-filesize") {
+			_ = v.delete("File is larger than max-filesize")
+			return errors.Err("the video is too big to sync, skipping for now")
+		}
+		if string(errorLog) != "" {
+			if strings.Contains(string(errorLog), "HTTP Error 429") {
+				v.pool.SetThrottled(sourceAddress)
+			}
+			log.Printf("Command finished with error: %v", errors.Err(string(errorLog)))
+			_ = v.delete("due to error")
+			return errors.Err(string(errorLog))
+		}
+		fi, err := os.Stat(v.getFullPath())
+		if err != nil {
+			return errors.Err(err)
+		}
+		err = os.Chmod(v.getFullPath(), 0777)
+		if err != nil {
+			return errors.Err(err)
+		}
+		videoSize := fi.Size()
+		v.size = &videoSize
+		break
+	}
+	return nil
+}
+func (v *YoutubeVideo) monitorSlowDownload(ticker *time.Ticker, stop *stop.Group, address string, cmd *exec.Cmd) {
+	count := 0
+	lastSize := int64(0)
+	for {
+		select {
+		case <-stop.Ch():
+			return
+		case <-ticker.C:
+			size, err := logUtils.DirSize(v.videoDir())
+			if err != nil {
+				log.Errorf("error while getting size of download directory: %s", errors.FullTrace(err))
+				continue
+			}
+			delta := size - lastSize
+			avgSpeed := delta / 10
+			if avgSpeed < 200*1024 { //200 KB/s
+				count++
+			} else {
+				count--
+			}
+			if count > 3 {
+				err := cmd.Process.Signal(syscall.SIGKILL)
+				if err != nil {
+					log.Errorf("failure in killing slow download: %s", errors.Err(err))
+					return
+				}
+			}
+		}
+	}
+}
+
+func (v *YoutubeVideo) trackProgressBar(argsWithFilters []string, ticker *time.Ticker, metadata *ytMetadata, done *stop.Group, sourceAddress string) {
 	v.progressBarWg.Add(1)
 	go func() {
 		defer v.progressBarWg.Done()
@@ -411,7 +510,7 @@ func (v *YoutubeVideo) download() error {
 		}()
 		for {
 			select {
-				case <-done:
+			case <-done.Ch():
 				return
 			case <-ticker.C:
 				size, err := logUtils.DirSize(v.videoDir())
@@ -427,65 +526,6 @@ func (v *YoutubeVideo) download() error {
 			}
 		}
 	}()
-
-		errorLog, _ := ioutil.ReadAll(stderr)
-		outLog, _ := ioutil.ReadAll(stdout)
-		err = cmd.Wait()
-
-		//stop the progress bar
-		ticker.Stop()
-		done <- true
-
-		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") {
-					if i == (len(qualities) - 1) {
-						return errors.Err(string(errorLog))
-					}
-					continue //this bypasses the yt throttling IP redistribution... TODO: don't
-				} else if strings.Contains(string(errorLog), "YouTube said: Unable to extract video data") && !strings.Contains(userAgent[1], "Googlebot") {
-					i-- //do not lower quality when trying a different user agent
-					userAgent = []string{downloader.GoogleBotUA}
-					log.Infof("trying different user agent for video %s", v.ID())
-					continue
-				}
-				return errors.Err(string(errorLog))
-			}
-			return errors.Err(err)
-		}
-		log.Debugln(string(outLog))
-
-		if strings.Contains(string(outLog), "does not pass filter duration") {
-			_ = v.delete("does not pass filter duration")
-			return errors.Err("video is too long to process")
-		}
-		if strings.Contains(string(outLog), "File is larger than max-filesize") {
-			_ = v.delete("File is larger than max-filesize")
-			return errors.Err("the video is too big to sync, skipping for now")
-		}
-		if string(errorLog) != "" {
-			if strings.Contains(string(errorLog), "HTTP Error 429") {
-				v.pool.SetThrottled(sourceAddress)
-			}
-			log.Printf("Command finished with error: %v", errors.Err(string(errorLog)))
-			_ = v.delete("due to error")
-			return errors.Err(string(errorLog))
-		}
-		fi, err := os.Stat(v.getFullPath())
-		if err != nil {
-			return errors.Err(err)
-		}
-		err = os.Chmod(v.getFullPath(), 0777)
-		if err != nil {
-			return errors.Err(err)
-		}
-		videoSize := fi.Size()
-		v.size = &videoSize
-		break
-	}
-	return nil
 }
 
 type ytMetadata struct {