3 Commits
v1.1 ... master

Author SHA1 Message Date
400aab0964 Shortened download status 2018-04-25 19:15:23 +02:00
fc046da8a6 Error handling; extended logging 2018-04-25 19:13:17 +02:00
e37ec06287 Fixed empty line crash; Download status 2018-04-25 18:54:39 +02:00

View File

@@ -6,6 +6,7 @@ import (
"log"
"os"
"regexp"
"strings"
"sync"
//"path/filepath"
@@ -39,20 +40,25 @@ func (b *Batch) Start() {
for scanner.Scan() {
//Call download
log.Println(scanner.Text())
//add go routine to wait for
wg.Add(1)
go downloadVideo(b.destDir, scanner.Text(), wg)
if strings.TrimSpace(scanner.Text()) != "" {
wg.Add(1)
log.Println(scanner.Text())
go downloadVideo(b.destDir, strings.TrimSpace(scanner.Text()), &wg)
} else {
log.Println("Ignoring blank line")
}
}
//wait for all go routines to finish
wg.Wait()
log.Println("All downloads finished")
if err := scanner.Err(); err != nil {
log.Fatal(err)
}
}
func downloadVideo(destDir, url string, wg sync.WaitGroup) {
func downloadVideo(destDir, url string, wg *sync.WaitGroup) {
// NewYoutube(debug) if debug parameter will set true we can log of messages
//defer Done() so that WaitGroup knows when the routine finishes
defer wg.Done()
@@ -63,6 +69,20 @@ func downloadVideo(destDir, url string, wg sync.WaitGroup) {
filename := fmt.Sprintf("%s/%s.%s", destDir, y.StreamList[0]["title"], fileext)
log.Println("Start downloading:", filename)
y.StartDownload(filename)
log.Println("Finished downloading:", filename)
go func() {
var i int64 = 0
for i < 100 {
i = <-y.DownloadPercent
if i%10 == 0 {
log.Println(i, "%", y.StreamList[0]["title"])
}
}
}()
err := y.StartDownload(filename)
if err != nil {
log.Println("Failed to download", url)
log.Println("Message:", err.Error())
} else {
log.Println("Finished downloading:", filename)
}
}