Merge branch 'dev' of https://github.com/LumePart/Explo into dev

Author: LumePart

docker/start.sh

@@ -35,7 +35,7 @@ chmod 600 /etc/crontabs/root
 
 echo "[setup] Starting cron..."
 
-if [ "$EXCECUTE_ON_START" = "true" ]; then
+if [ "$EXECUTE_ON_START" = "true" ]; then
     echo "[setup] Executing startup task..."  
     apk add --upgrade yt-dlp && cd /opt/explo && ./explo $START_FLAGS
 

src/config/flags.go

@@ -24,9 +24,9 @@ func (cfg *Config) GetFlags() error {
 	flag.StringVarP(&downloadMode, "download-mode", "d", "normal", "Download mode: 'normal' (download only when track is not found locally), 'skip' (skip downloading, only use tracks already found locally), 'force' (always download, don't check for local tracks)")
 	flag.BoolVarP(&excludeLocal, "exclude-local", "e",  false, "Exclude locally found tracks from the imported playlist")
 	flag.BoolVar(&persist, "persist", true, "Keep playlists between generations")
-	persistSet := flag.Lookup("persist").Changed
 
 	flag.Parse()
+	persistSet := flag.Lookup("persist").Changed
 
 	// Validation for playlist
 	if !contains(validPlaylists, playlist) {

src/downloader/downloader.go

@@ -59,7 +59,7 @@ func (c *DownloadClient) StartDownload(tracks *[]*models.Track) {
 
 	for _, d := range c.Downloaders {
 		var g errgroup.Group
-		g.SetLimit(2)
+		g.SetLimit(1)
 
 		for _, track := range *tracks {
 			if track.Present {

src/downloader/slskd.go

@@ -209,7 +209,7 @@ func (c Slskd) searchStatus(ID, trackDetails string, count int) (bool, error) {
 	}
 
 	slog.Debug(fmt.Sprintf("[%s] (%d/%d) Searching for %s", "slskd", count, c.Cfg.Retry, trackDetails))
-	time.Sleep(20 * time.Second)
+	time.Sleep(15 * time.Second)
 	return c.searchStatus(ID, trackDetails, count+1)
 }
 

src/downloader/youtube.go

@@ -47,13 +47,25 @@ type Youtube struct {
 	DownloadDir string
 	HttpClient  *util.HttpClient
 	Cfg         cfg.Youtube
+	gouTubeOpts goutubedl.Options
 }
 
 func NewYoutube(cfg cfg.Youtube, discovery, downloadDir string, httpClient *util.HttpClient) *Youtube { // init downloader cfg for youtube
+	// check for custom ytdlp options
+	if cfg.YtdlpPath != "" {
+		goutubedl.Path = cfg.YtdlpPath
+	}
+
+	var opts goutubedl.Options
+	if _, err := os.Stat(cfg.CookiesPath); err == nil {
+		opts.Cookies = cfg.CookiesPath
+	}
+
 	return &Youtube{
 		DownloadDir: downloadDir,
 		Cfg:         cfg,
-		HttpClient:  httpClient}
+		HttpClient:  httpClient,
+		gouTubeOpts: opts}
 }
 
 func (c *Youtube) GetConf() (MonitorConfig, error) {
@@ -144,16 +156,8 @@ func getTopic(cfg cfg.Youtube, videos Videos, track models.Track) string { // ge
 }
 
 func getVideo(ctx context.Context, c Youtube, videoID string) (*goutubedl.DownloadResult, error) { // gets video stream using yt-dlp
-	if c.Cfg.YtdlpPath != "" {
-		goutubedl.Path = c.Cfg.YtdlpPath
-	}
-
-	var opts goutubedl.Options
-	if _, err := os.Stat(c.Cfg.CookiesPath); err == nil {
-		opts.Cookies = c.Cfg.CookiesPath
-	}
 
-	result, err := goutubedl.New(ctx, videoID, opts)
+	result, err := goutubedl.New(ctx, videoID, c.gouTubeOpts)
 	if err != nil {
 		return nil, fmt.Errorf("could not create URL for video download (ID: %s): %s", videoID, err.Error())
 	}