diff --git a/downloader/downloaders/ytdlp-raw.go b/downloader/downloaders/ytdlp-raw.go index 59908b4..7ab6285 100644 --- a/downloader/downloaders/ytdlp-raw.go +++ b/downloader/downloaders/ytdlp-raw.go @@ -2,40 +2,29 @@ package downloaders import ( "fmt" - "log" "os" "os/exec" - "github.com/gen2brain/beeep" + logger "git.site.quack-lab.dev/dave/cylogger" ) type YTDLPRawDownloader struct{} func (d *YTDLPRawDownloader) Download(url string) error { + downloadlogger := logger.Default.WithPrefix(fmt.Sprintf("url=%q", url)) _, ongoing := ongoingDownloads[url] if ongoing { // return fmt.Errorf("Download %s is already ongoing", url) - log.Printf("Download %s is already ongoing", url) + downloadlogger.Info("Download is already ongoing") return nil } ongoingDownloadsMutex.Lock() ongoingDownloads[url] = struct{}{} ongoingDownloadsMutex.Unlock() - log.Printf("YTDLPRaw downloading %s", url) + downloadlogger.Info("YTDLPRaw downloading") - go func() { - err := beeep.Beep(beeep.DefaultFreq, beeep.DefaultDuration) - if err != nil { - log.Printf("Failed beeping with %+v", err) - } - err = beeep.Alert("Download Started", url, "assets/information.png") - if err != nil { - log.Printf("Failed alerting with %+v", err) - } - }() - - cmd := exec.Command("yt-dlp", "-o", "C:/Users/Administrator/ytdlpVideos/%(title)s.%(ext)s", "-f", "bestvideo[ext=mp4]+bestaudio[ext=m4a]", "-N", "12", "--sponsorblock-mark", "all", url) + cmd := exec.Command("yt-dlp", "-o", "C:/Users/Administrator/ytdlpVideos/%(uploader)s/%(title)s.%(ext)s", "-f", "bestvideo[ext=mp4]+bestaudio[ext=m4a]", "-N", "12", "--sponsorblock-mark", "all", url) cmd.Stdout = os.Stdout cmd.Stderr = os.Stderr err := cmd.Run() @@ -43,7 +32,7 @@ func (d *YTDLPRawDownloader) Download(url string) error { return fmt.Errorf("failed downloading %s with %+v", url, err) } - log.Printf("Downloaded %s", url) + downloadlogger.Info("Downloaded") ongoingDownloadsMutex.Lock() delete(ongoingDownloads, url) ongoingDownloadsMutex.Unlock() diff --git a/downloader/main.go b/downloader/main.go index 0de55e4..f31a0b7 100644 --- a/downloader/main.go +++ b/downloader/main.go @@ -15,9 +15,9 @@ import ( "github.com/nsqio/go-nsq" ) -// var downloader downloaders.Downloader = &downloaders.YTDLPRawDownloader{} +var downloader downloaders.Downloader = &downloaders.YTDLPRawDownloader{} // var downloader downloaders.Downloader = &downloaders.KidaiDownloader{} -var downloader downloaders.Downloader = &downloaders.YTDLPLibDownloader{} +// var downloader downloaders.Downloader = &downloaders.YTDLPLibDownloader{} type DLHandler struct{}