dave/youtube-downloader
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Have downloader use new logging utilities

Browse Source
This commit is contained in:
PhatPhuckDave
2025-10-06 13:43:13 +02:00
parent 4601a0fc60
commit eb4f715ce3
4 changed files with 79 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
downloader/main.go
View File

@@ -3,39 +3,18 @@ package main
import (
"context"
"encoding/json"
"flag"
"fmt"
"io"
"log"
"os"
"os/signal"
"syscall"
"time"
"ytdl/downloaders"
logger "git.site.quack-lab.dev/dave/cylogger"
"github.com/nsqio/go-nsq"
)
var Error *log.Logger
var Warning *log.Logger
func init() {
log.SetFlags(log.Lmicroseconds | log.Lshortfile)
logFile, err := os.Create("ytdl.log")
if err != nil {
log.Printf("Error creating log file: %v", err)
os.Exit(1)
}
logger := io.MultiWriter(os.Stdout, logFile)
log.SetOutput(logger)
Error = log.New(io.MultiWriter(logFile, os.Stderr, os.Stdout),
fmt.Sprintf("%sERROR:%s ", "\033[0;101m", "\033[0m"),
log.Lmicroseconds|log.Lshortfile)
Warning = log.New(io.MultiWriter(logFile, os.Stdout),
fmt.Sprintf("%sWarning:%s ", "\033[0;93m", "\033[0m"),
log.Lmicroseconds|log.Lshortfile)
}
// var downloader downloaders.Downloader = &downloaders.YTDLPRawDownloader{}
// var downloader downloaders.Downloader = &downloaders.KidaiDownloader{}
var downloader downloaders.Downloader = &downloaders.YTDLPLibDownloader{}
@@ -43,14 +22,13 @@ var downloader downloaders.Downloader = &downloaders.YTDLPLibDownloader{}
type DLHandler struct{}
func (*DLHandler) HandleMessage(message *nsq.Message) error {
log.Printf("Received message '%s' with %d attempts", message.Body, message.Attempts)
NotifyDiscordErrorless(fmt.Sprintf("Received message '%s' with %d attempts", message.Body, message.Attempts))
messagelog := logger.Default.WithPrefix(fmt.Sprintf("message=%q", message.Body)).WithPrefix(fmt.Sprintf("attempts=%d", message.Attempts))
messagelog.Info("Received message")
data := DownloadRequest{}
err := json.Unmarshal(message.Body, &data)
if err != nil {
Error.Printf("Error unmarshalling message: %v", err)
NotifyDiscordErrorless(fmt.Sprintf("Error unmarshalling message: %v", err))
messagelog.Error("Error unmarshalling message: %v", err)
return err
}
@@ -58,12 +36,14 @@ func (*DLHandler) HandleMessage(message *nsq.Message) error {
defer cancel()
go func() {
messagelog.Debug("Starting touch ticker")
ticker := time.NewTicker(1 * time.Second)
defer ticker.Stop()
for {
select {
case <-ticker.C:
messagelog.Debug("Touching message")
message.Touch()
case <-ctx.Done():
return
@@ -71,55 +51,63 @@ func (*DLHandler) HandleMessage(message *nsq.Message) error {
}
}()
messagelog.Debug("Downloading %q", data.Link)
err = downloader.Download(data.Link)
if err != nil {
Error.Printf("Error downloading %s: %v", data.Link, err)
NotifyDiscordErrorless(fmt.Sprintf("Error downloading %s: %v", data.Link, err))
messagelog.Error("Error downloading %s: %v", data.Link, err)
return err
}
messagelog.Info("Downloaded %q", data.Link)
message.Finish()
NotifyDiscordErrorless(fmt.Sprintf("Downloaded %s", data.Link))
return nil
}
func main() {
flag.Parse()
logger.InitFlag()
// err := downloader.Download("https://www.youtube.com/watch?v=SiKjprtiPaw")
// if err != nil {
// Error.Printf("Error downloading: %v", err)
// }
// return
logger.Info("Starting downloader")
config := nsq.NewConfig()
config.MaxAttempts = 5
config.MaxInFlight = downloaders.DOWNLOAD_WORKERS
config.MsgTimeout = 10 * time.Second
logger.Info("Creating consumer")
consumer, err := nsq.NewConsumer("ytdqueue", "dl", config)
if err != nil {
Error.Printf("Error creating consumer: %v", err)
logger.Error("Error creating consumer: %v", err)
return
}
logger.Info("Creating handlers")
for i := 0; i < downloaders.DOWNLOAD_WORKERS; i++ {
consumer.AddHandler(&DLHandler{})
}
url := "192.168.1.123:41505"
log.Printf("Connecting to nsq at %s", url)
logger.Info("Connecting to nsq at %s", url)
err = consumer.ConnectToNSQD(url)
if err != nil {
Error.Printf("Error connecting to nsq: %v", err)
logger.Error("Error connecting to nsq: %v", err)
return
}
log.Printf("Connected to nsq at %s", url)
logger.Info("Connected to nsq at %s", url)
sigChan := make(chan os.Signal, 1)
signal.Notify(sigChan, syscall.SIGINT, syscall.SIGTERM)
logger.Info("Waiting for signal to terminate")
<-sigChan
log.Println("Received signal to terminate. Initiating graceful shutdown...")
logger.Info("Received signal to terminate. Initiating graceful shutdown...")
consumer.Stop()
<-consumer.StopChan
log.Println("Graceful shutdown completed.")
logger.Info("Graceful shutdown completed.")
}