prevent downloading playlist with format selection

server/formats/parser.go

@@ -0,0 +1,56 @@
+package formats
+
+import (
+	"encoding/json"
+	"log/slog"
+	"os/exec"
+	"sync"
+
+	"github.com/marcopeocchi/yt-dlp-web-ui/v3/server/config"
+)
+
+func ParseURL(url string) (*Metadata, error) {
+	cmd := exec.Command(config.Instance().DownloaderPath, url, "-J")
+
+	stdout, err := cmd.Output()
+	if err != nil {
+		slog.Error("failed to retrieve metadata", slog.String("err", err.Error()))
+		return nil, err
+	}
+
+	slog.Info(
+		"retrieving metadata",
+		slog.String("caller", "getFormats"),
+		slog.String("url", url),
+	)
+
+	info := &Metadata{URL: url}
+	best := &Format{}
+
+	var (
+		wg            sync.WaitGroup
+		decodingError error
+	)
+
+	wg.Add(2)
+
+	go func() {
+		decodingError = json.Unmarshal(stdout, &info)
+		wg.Done()
+	}()
+
+	go func() {
+		decodingError = json.Unmarshal(stdout, &best)
+		wg.Done()
+	}()
+
+	wg.Wait()
+
+	if decodingError != nil {
+		return nil, err
+	}
+
+	info.Best = *best
+
+	return info, nil
+}

server/formats/types.go

@@ -0,0 +1,28 @@
+package formats
+
+// Used to deser the formats in the -J output
+type Metadata struct {
+	Type      string     `json:"_type"`
+	Formats   []Format   `json:"formats"`
+	Best      Format     `json:"best"`
+	Thumbnail string     `json:"thumbnail"`
+	Title     string     `json:"title"`
+	URL       string     `json:"url"`
+	Entries   []Metadata `json:"entries"` // populated if url is playlist
+}
+
+func (m *Metadata) IsPlaylist() bool {
+	return m.Type == "playlist"
+}
+
+// A skimmed yt-dlp format node
+type Format struct {
+	Format_id   string  `json:"format_id"`
+	Format_note string  `json:"format_note"`
+	FPS         float32 `json:"fps"`
+	Resolution  string  `json:"resolution"`
+	VCodec      string  `json:"vcodec"`
+	ACodec      string  `json:"acodec"`
+	Size        float32 `json:"filesize_approx"`
+	Language    string  `json:"language"`
+}

server/internal/common_types.go

@@ -10,7 +10,6 @@ type ProgressTemplate struct {
 	Eta        float32 `json:"eta"`
 }
 
-
 type PostprocessTemplate struct {
 	FilePath string `json:"filepath"`
 }
@@ -45,27 +44,6 @@ type DownloadInfo struct {
 	CreatedAt   time.Time `json:"created_at"`
 }
 
-// Used to deser the formats in the -J output
-type DownloadFormats struct {
-	Formats   []Format `json:"formats"`
-	Best      Format   `json:"best"`
-	Thumbnail string   `json:"thumbnail"`
-	Title     string   `json:"title"`
-	URL       string   `json:"url"`
-}
-
-// A skimmed yt-dlp format node
-type Format struct {
-	Format_id   string  `json:"format_id"`
-	Format_note string  `json:"format_note"`
-	FPS         float32 `json:"fps"`
-	Resolution  string  `json:"resolution"`
-	VCodec      string  `json:"vcodec"`
-	ACodec      string  `json:"acodec"`
-	Size        float32 `json:"filesize_approx"`
-	Language    string  `json:"language"`
-}
-
 // struct representing the response sent to the client
 // as JSON-RPC result field
 type ProcessResponse struct {

server/internal/process.go

@@ -11,7 +11,6 @@ import (
 	"log/slog"
 	"regexp"
 	"slices"
-	"sync"
 	"syscall"
 
 	"os"
@@ -261,54 +260,6 @@ func (p *Process) Kill() error {
 	return nil
 }
 
-// Returns the available format for this URL
-//
-// TODO: Move out from process.go
-func (p *Process) GetFormats() (DownloadFormats, error) {
-	cmd := exec.Command(config.Instance().DownloaderPath, p.Url, "-J")
-
-	stdout, err := cmd.Output()
-	if err != nil {
-		slog.Error("failed to retrieve metadata", slog.String("err", err.Error()))
-		return DownloadFormats{}, err
-	}
-
-	slog.Info(
-		"retrieving metadata",
-		slog.String("caller", "getFormats"),
-		slog.String("url", p.Url),
-	)
-
-	info := DownloadFormats{URL: p.Url}
-	best := Format{}
-
-	var (
-		wg            sync.WaitGroup
-		decodingError error
-	)
-
-	wg.Add(2)
-
-	go func() {
-		decodingError = json.Unmarshal(stdout, &info)
-		wg.Done()
-	}()
-	go func() {
-		decodingError = json.Unmarshal(stdout, &best)
-		wg.Done()
-	}()
-
-	wg.Wait()
-
-	if decodingError != nil {
-		return DownloadFormats{}, err
-	}
-
-	info.Best = best
-
-	return info, nil
-}
-
 func (p *Process) GetFileName(o *DownloadOutput) error {
 	cmd := exec.Command(
 		config.Instance().DownloaderPath,

server/rpc/service.go

@@ -4,6 +4,7 @@ import (
 	"errors"
 	"log/slog"
 
+	"github.com/marcopeocchi/yt-dlp-web-ui/v3/server/formats"
 	"github.com/marcopeocchi/yt-dlp-web-ui/v3/server/internal"
 	"github.com/marcopeocchi/yt-dlp-web-ui/v3/server/internal/livestream"
 	"github.com/marcopeocchi/yt-dlp-web-ui/v3/server/sys"
@@ -21,12 +22,6 @@ type Pending []string
 
 type NoArgs struct{}
 
-type Args struct {
-	Id     string
-	URL    string
-	Params []string
-}
-
 // Exec spawns a Process.
 // The result of the execution is the newly spawned process Id.
 func (s *Service) Exec(args internal.DownloadRequest, result *string) error {
@@ -91,7 +86,7 @@ func (s *Service) KillAllLivestream(args NoArgs, result *struct{}) error {
 }
 
 // Progess retrieves the Progress of a specific Process given its Id
-func (s *Service) Progess(args Args, progress *internal.DownloadProgress) error {
+func (s *Service) Progess(args internal.DownloadRequest, progress *internal.DownloadProgress) error {
 	proc, err := s.db.Get(args.Id)
 	if err != nil {
 		return err
@@ -102,13 +97,20 @@ func (s *Service) Progess(args Args, progress *internal.DownloadProgress) error
 }
 
 // Progess retrieves available format for a given resource
-func (s *Service) Formats(args Args, meta *internal.DownloadFormats) error {
-	var (
-		err error
-		p   = internal.Process{Url: args.URL}
-	)
-	*meta, err = p.GetFormats()
-	return err
+func (s *Service) Formats(args internal.DownloadRequest, meta *formats.Metadata) error {
+	var err error
+
+	metadata, err := formats.ParseURL(args.URL)
+	if err != nil && metadata == nil {
+		return err
+	}
+
+	if metadata.IsPlaylist() {
+		go internal.PlaylistDetect(args, s.mq, s.db)
+	}
+
+	*meta = *metadata
+	return nil
 }
 
 // Pending retrieves a slice of all Pending/Running processes ids