Update yt-dlp to 2023.06.21 from 2023.03.04

Release notes https://github.com/yt-dlp/yt-dlp/releases/tag/2023.06.21

.github/workflows/push.yml

@@ -1,10 +1,6 @@
 name: Build on push and PRs
 
-on:
-  push:
-    branches:
-      - "master"
-  pull_request:
+on: [push,pull_request]
 
 jobs:
   build:

Dockerfile

@@ -1,9 +1,9 @@
 # bump: golang /GOLANG_VERSION=([\d.]+)/ docker:golang|^1
 # bump: golang link "Release notes" https://golang.org/doc/devel/release.html
-ARG GOLANG_VERSION=1.23.4
+ARG GOLANG_VERSION=1.20.5
 # bump: yt-dlp /YT_DLP=([\d.-]+)/ https://github.com/yt-dlp/yt-dlp.git|/^\d/|sort
 # bump: yt-dlp link "Release notes" https://github.com/yt-dlp/yt-dlp/releases/tag/$LATEST
-ARG YT_DLP=2025.01.12
+ARG YT_DLP=2023.06.21
 
 FROM golang:$GOLANG_VERSION AS base
 ARG YT_DLP
@@ -12,8 +12,7 @@ RUN \
   apt-get update -q && \
   apt-get install -y -q python-is-python3 && \
   curl -L https://github.com/yt-dlp/yt-dlp/releases/download/$YT_DLP/yt-dlp -o /usr/local/bin/yt-dlp && \
-  chmod a+x /usr/local/bin/yt-dlp && \
-  apt-get install -y ffmpeg
+  chmod a+x /usr/local/bin/yt-dlp
 
 FROM base AS dev
 

README.md

@@ -1,19 +1,18 @@
 ## goutubedl
 
-Go wrapper for
-[youtube-dl](https://github.com/ytdl-org/youtube-dl) and
-[yt-dlp](https://github.com/yt-dlp/yt-dlp).
-Currently only tested and developed using yt-dlp.
-API documentation can be found at [godoc.org](https://pkg.go.dev/gitea.kaz62.ru/dilap54/goutubedl?tab=doc).
+Go wrapper for [youtube-dl](https://github.com/ytdl-org/youtube-dl) and [yt-dlp](https://github.com/yt-dlp/yt-dlp), currently tested and
+developed using yt-dlp.
+API documentation can be found at [godoc.org](https://pkg.go.dev/github.com/wader/goutubedl?tab=doc).
 
 See [yt-dlp documentation](https://github.com/yt-dlp/yt-dlp) for how to
-install and what is recommended to install in addition to yt-dl.
+install and what is recommended to install in addition to youtube-dl.
 
-goutubedl default uses `PATH` to find `youtube-dl` or `yt-dlp` (in that order) but can be configured with the
-`goutubedl.Path` variable.
+goutubedl default uses `PATH` to find youtube-dl but it can be configured with the `goutubedl.Path`
+variable. Default is currently `youtube-dl` for backwards compability. If your using yt-dlp you
+probably want to set it to `yt-dlp`.
 
-Due to the nature of and frequent updates of yt-dl only the latest version is tested.
-But it seems to work well with older versions also.
+Due to the nature and frequent updates of youtube-dl only the latest version
+is tested. But it seems to work well with older versions also.
 
 ### Usage
 
@@ -27,7 +26,7 @@ import (
 	"log"
 	"os"
 
-	"gitea.kaz62.ru/dilap54/goutubedl"
+	"github.com/wader/goutubedl"
 )
 
 func main() {
@@ -53,20 +52,10 @@ func main() {
 See [goutubedl cmd tool](cmd/goutubedl/main.go) or [ydls](https://github.com/wader/ydls)
 for usage examples.
 
-### Default options and cache
-
-#### .netrc
-
-goutubedl by default uses `--netrc` to use `~/.netrc` authentication data.
-
-#### Cache directory
-
-yt-dlp stores various extractor session data to speed up things in `${XDG_CACHE_HOME}/yt-dlp` (usually `~/.cache/yt-dlp`). You might want to preverse this directory if your running things in ephemeral conatiners etc.
-
 ### Development
 
 ```sh
-docker build --target dev -t goutubedl-dev .
+docker build -t goutubedl-dev .
 docker run --rm -ti -v "$PWD:$PWD" -w "$PWD" goutubedl-dev
 go test -v -race -cover
 ```

cmd/example/main.go

@@ -6,7 +6,7 @@ import (
 	"log"
 	"os"
 
-	"gitea.kaz62.ru/dilap54/goutubedl"
+	"github.com/wader/goutubedl"
 )
 
 func main() {

cmd/goutubedl/main.go

@@ -7,9 +7,8 @@ import (
 	"io"
 	"log"
 	"os"
-	"os/exec"
 
-	"gitea.kaz62.ru/dilap54/goutubedl"
+	"github.com/wader/goutubedl"
 )
 
 var dumpFlag = flag.Bool("J", false, "Dump JSON")
@@ -25,11 +24,7 @@ func main() {
 	result, err := goutubedl.New(
 		context.Background(),
 		flag.Arg(0),
-		goutubedl.Options{
-			Type:     optType,
-			DebugLog: log.Default(),
-			StderrFn: func(cmd *exec.Cmd) io.Writer { return os.Stderr },
-		},
+		goutubedl.Options{Type: optType, DebugLog: log.Default()},
 	)
 	if err != nil {
 		log.Fatal(err)

go.mod

@@ -1,4 +1,4 @@
-module gitea.kaz62.ru/dilap54/goutubedl
+module github.com/wader/goutubedl
 
 go 1.12
 

goutubedl.go

@@ -9,6 +9,7 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"io/ioutil"
 	"net/http"
 	"os"
 	"os/exec"
@@ -17,22 +18,8 @@ import (
 	"strings"
 )
 
-// Path to youtube-dl binary. If not set look for "youtube-dl" then "yt-dlp" in PATH.
-var Path = ""
-
-func ProbePath() string {
-	if Path != "" {
-		return Path
-	}
-
-	for _, n := range []string{"youtube-dl", "yt-dlp"} {
-		if p, err := exec.LookPath(n); err == nil {
-			return p
-		}
-	}
-
-	return "youtube-dl"
-}
+// Path to youtube-dl binary. Default look for "youtube-dl" in PATH.
+var Path = "youtube-dl"
 
 // Printer is something that can print
 type Printer interface {
@@ -128,13 +115,12 @@ type Info struct {
 	WebpageURL  string `json:"webpage_url"`
 	Description string `json:"description"`
 	Thumbnail   string `json:"thumbnail"`
-	// don't unmarshal, populated from image thumbnail file
+	// not unmarshalled, populated from image thumbnail file
 	ThumbnailBytes []byte      `json:"-"`
 	Thumbnails     []Thumbnail `json:"thumbnails"`
 
-	Formats           []Format              `json:"formats"`
-	Subtitles         map[string][]Subtitle `json:"subtitles"`
-	AutomaticCaptions map[string][]*Caption `json:"automatic_captions"`
+	Formats   []Format              `json:"formats"`
+	Subtitles map[string][]Subtitle `json:"subtitles"`
 
 	// Playlist entries if _type is playlist
 	Entries []Info `json:"entries"`
@@ -180,18 +166,10 @@ type Subtitle struct {
 	URL      string `json:"url"`
 	Ext      string `json:"ext"`
 	Language string `json:"-"`
-	// don't unmarshal, populated from subtitle file
+	// not unmarshalled, populated from subtitle file
 	Bytes []byte `json:"-"`
 }
 
-type Caption struct {
-	Ext      string `json:"ext"`
-	Protocol string `json:"protocol"`
-	URL      string `json:"url"`
-	Name     string `json:"name"`
-	Bytes    []byte `json:"-"`
-}
-
 func (f Format) String() string {
 	return fmt.Sprintf("%s:%s:%s abr:%f vbr:%f tbr:%f",
 		f.FormatID,
@@ -213,52 +191,32 @@ const (
 	TypeSingle
 	// TypePlaylist playlist with multiple tracks, files etc
 	TypePlaylist
-	// TypeChannel channel containing one or more playlists, which will be flattened
-	TypeChannel
 )
 
 var TypeFromString = map[string]Type{
 	"any":      TypeAny,
 	"single":   TypeSingle,
 	"playlist": TypePlaylist,
-	"channel":  TypeChannel,
 }
 
 // Options for New()
 type Options struct {
-	Type                    Type
-	PlaylistStart           uint   // --playlist-start
-	PlaylistEnd             uint   // --playlist-end
-	Downloader              string // --downloader
-	DownloadThumbnail       bool
-	DownloadSubtitles       bool
-	DownloadSubtitlesLang   []string
-	DownloadSubtitlesFormat string
-	DownloadSections        string // --download-sections
-	Impersonate             string // --impersonate
-
-	ProxyUrl           string // --proxy URL  http://host:port or socks5://host:port
-	UseIPV4            bool   // -4 Make all connections via IPv4
-	Cookies            string // --cookies FILE
-	CookiesFromBrowser string // --cookies-from-browser BROWSER[:FOLDER]
-	DebugLog           Printer
-	StderrFn           func(cmd *exec.Cmd) io.Writer // if not nil, function to get Writer for stderr
-	HTTPClient         *http.Client                  // Client for download thumbnail and subtitles (nil use http.DefaultClient)
-	MergeOutputFormat  string                        // --merge-output-format
-	SortingFormat      string                        // --format-sort
-	ExtractorArgs      string                        // --extractor-args
-	InfoArgs           []string
-	DownloadArgs       []string
-
-	// Set to true if you don't want to use the result.Info structure after the goutubedl.New() call,
-	// so the given URL will be downloaded in a single pass in the DownloadResult.Download() call.
-	noInfoDownload bool
+	Type              Type
+	PlaylistStart     uint   // --playlist-start
+	PlaylistEnd       uint   // --playlist-end
+	Downloader        string // --downloader
+	DownloadThumbnail bool
+	DownloadSubtitles bool
+	ProxyUrl          string // --proxy URL  http://host:port or socks5://host:port
+	DebugLog          Printer
+	StderrFn          func(cmd *exec.Cmd) io.Writer // if not nil, function to get Writer for stderr
+	HTTPClient        *http.Client                  // Client for download thumbnail and subtitles (nil use http.DefaultClient)
 }
 
 // Version of youtube-dl.
 // Might be a good idea to call at start to assert that youtube-dl can be found.
 func Version(ctx context.Context) (string, error) {
-	cmd := exec.CommandContext(ctx, ProbePath(), "--version")
+	cmd := exec.CommandContext(ctx, Path, "--version")
 	versionBytes, cmdErr := cmd.Output()
 	if cmdErr != nil {
 		return "", cmdErr
@@ -267,35 +225,12 @@ func Version(ctx context.Context) (string, error) {
 	return strings.TrimSpace(string(versionBytes)), nil
 }
 
-// Downloads given URL using the given options and filter (usually a format id or quality designator).
-// If filter is empty, then youtube-dl will use its default format selector.
-func Download(
-	ctx context.Context,
-	rawURL string,
-	options Options,
-	filter string,
-) (*DownloadResult, error) {
-	options.noInfoDownload = true
-	d, err := New(ctx, rawURL, options)
-	if err != nil {
-		return nil, err
-	}
-	return d.Download(ctx, filter)
-}
-
 // New downloads metadata for URL
 func New(ctx context.Context, rawURL string, options Options) (result Result, err error) {
 	if options.DebugLog == nil {
 		options.DebugLog = nopPrinter{}
 	}
 
-	if options.noInfoDownload {
-		return Result{
-			RawURL:  rawURL,
-			Options: options,
-		}, nil
-	}
-
 	info, rawJSON, err := infoFromURL(ctx, rawURL, options)
 	if err != nil {
 		return Result{}, err
@@ -306,69 +241,35 @@ func New(ctx context.Context, rawURL string, options Options) (result Result, er
 
 	return Result{
 		Info:    info,
-		RawURL:  rawURL,
 		RawJSON: rawJSONCopy,
 		Options: options,
 	}, nil
 }
 
-func infoFromURL(
-	ctx context.Context,
-	rawURL string,
-	options Options,
-) (info Info, rawJSON []byte, err error) {
+func infoFromURL(ctx context.Context, rawURL string, options Options) (info Info, rawJSON []byte, err error) {
 	cmd := exec.CommandContext(
 		ctx,
-		ProbePath(),
+		Path,
 		// see comment below about ignoring errors for playlists
 		"--ignore-errors",
-		// TODO: deprecated in yt-dlp?
 		"--no-call-home",
-		// use safer output filenmaes
-		// TODO: needed?
+		"--no-cache-dir",
+		"--skip-download",
 		"--restrict-filenames",
-		// use .netrc authentication data
-		"--netrc",
-		// provide url via stdin for security, youtube-dl has some run command args
+		// provide URL via stdin for security, youtube-dl has some run command args
 		"--batch-file", "-",
-		// dump info json
-		"--dump-single-json",
+		"-J",
 	)
 
 	if options.ProxyUrl != "" {
 		cmd.Args = append(cmd.Args, "--proxy", options.ProxyUrl)
 	}
 
-	if options.UseIPV4 {
-		cmd.Args = append(cmd.Args, "-4")
-	}
-
 	if options.Downloader != "" {
 		cmd.Args = append(cmd.Args, "--downloader", options.Downloader)
 	}
 
-	if options.Impersonate != "" {
-		cmd.Args = append(cmd.Args, "--impersonate", options.Impersonate)
-	}
-
-	if options.Cookies != "" {
-		cmd.Args = append(cmd.Args, "--cookies", options.Cookies)
-	}
-
-	if options.CookiesFromBrowser != "" {
-		cmd.Args = append(cmd.Args, "--cookies-from-browser", options.CookiesFromBrowser)
-	}
-
-	if options.ExtractorArgs != "" {
-		cmd.Args = append(cmd.Args,
-			"--extractor-args", options.ExtractorArgs,
-		)
-	}
-
-	cmd.Args = append(cmd.Args, options.InfoArgs...)
-
-	switch options.Type {
-	case TypePlaylist, TypeChannel:
+	if options.Type == TypePlaylist {
 		cmd.Args = append(cmd.Args, "--yes-playlist")
 
 		if options.PlaylistStart > 0 {
@@ -381,7 +282,7 @@ func infoFromURL(
 				"--playlist-end", strconv.Itoa(int(options.PlaylistEnd)),
 			)
 		}
-	case TypeSingle:
+	} else {
 		if options.DownloadSubtitles {
 			cmd.Args = append(cmd.Args,
 				"--all-subs",
@@ -390,18 +291,14 @@ func infoFromURL(
 		cmd.Args = append(cmd.Args,
 			"--no-playlist",
 		)
-	case TypeAny:
-		break
-	default:
-		return Info{}, nil, fmt.Errorf("unhandled options type value: %d", options.Type)
 	}
 
-	tempPath, _ := os.MkdirTemp("", "ydls")
+	tempPath, _ := ioutil.TempDir("", "ydls")
 	defer os.RemoveAll(tempPath)
 
 	stdoutBuf := &bytes.Buffer{}
 	stderrBuf := &bytes.Buffer{}
-	stderrWriter := io.Discard
+	stderrWriter := ioutil.Discard
 	if options.StderrFn != nil {
 		stderrWriter = options.StderrFn(cmd)
 	}
@@ -475,7 +372,7 @@ func infoFromURL(
 	if options.DownloadThumbnail && info.Thumbnail != "" {
 		resp, respErr := get(info.Thumbnail)
 		if respErr == nil {
-			buf, _ := io.ReadAll(resp.Body)
+			buf, _ := ioutil.ReadAll(resp.Body)
 			resp.Body.Close()
 			info.ThumbnailBytes = buf
 		}
@@ -487,37 +384,12 @@ func infoFromURL(
 		}
 	}
 
-	for _, lang := range options.DownloadSubtitlesLang {
-		if _, ok := info.AutomaticCaptions[lang]; !ok {
-			continue
-		}
-
-		for _, caption := range info.AutomaticCaptions[lang] {
-			if options.DownloadSubtitlesFormat != "" && caption.Ext != options.DownloadSubtitlesFormat {
-				continue
-			}
-
-			resp, respErr := get(caption.URL)
-			if respErr == nil {
-				buf, err := io.ReadAll(resp.Body)
-				if err != nil {
-					options.DebugLog.Print("err", "download captions "+caption.URL, err)
-				}
-				resp.Body.Close()
-				caption.Bytes = buf
-			} else {
-				options.DebugLog.Print("err", "download captions "+caption.URL, respErr)
-			}
-		}
-
-	}
-
 	if options.DownloadSubtitles {
 		for _, subtitles := range info.Subtitles {
 			for i, subtitle := range subtitles {
 				resp, respErr := get(subtitle.URL)
 				if respErr == nil {
-					buf, _ := io.ReadAll(resp.Body)
+					buf, _ := ioutil.ReadAll(resp.Body)
 					resp.Body.Close()
 					subtitles[i].Bytes = buf
 				}
@@ -526,31 +398,15 @@ func infoFromURL(
 	}
 
 	// as we ignore errors for playlists some entries might show up as null
-	//
-	// note: instead of doing full recursion, we assume entries in
-	// playlists and channels are at most 2 levels deep, and we just
-	// collect entries from both levels.
-	//
-	// the following cases have not been tested:
-	//
-	// - entries that are more than 2 levels deep (will be missed)
-	// - the ability to restrict entries to a single level (we include both levels)
-	if options.Type == TypePlaylist || options.Type == TypeChannel {
-		var filteredEntries []Info
+	if options.Type == TypePlaylist {
+		var filteredEntrise []Info
 		for _, e := range info.Entries {
-			if e.Type == "playlist" {
-				for _, ee := range e.Entries {
-					if ee.ID == "" {
-						continue
-					}
-					filteredEntries = append(filteredEntries, ee)
-				}
+			if e.ID == "" {
 				continue
-			} else if e.ID != "" {
-				filteredEntries = append(filteredEntries, e)
 			}
+			filteredEntrise = append(filteredEntrise, e)
 		}
-		info.Entries = filteredEntries
+		info.Entries = filteredEntrise
 	}
 
 	return info, stdoutBuf.Bytes(), nil
@@ -559,7 +415,6 @@ func infoFromURL(
 // Result metadata for a URL
 type Result struct {
 	Info    Info
-	RawURL  string
 	RawJSON []byte  // saved raw JSON. Used later when downloading
 	Options Options // options passed to New
 }
@@ -570,55 +425,24 @@ type DownloadResult struct {
 	waitCh chan struct{}
 }
 
-// Download format matched by filter (usually a format id or quality designator).
-// If filter is empty, then youtube-dl will use its default format selector.
-// It's a shortcut of DownloadWithOptions where the options use the default value
+// Download format matched by filter (usually a format id or "best").
+// Filter should not be a combine filter like "1+2" as then youtube-dl
+// won't write to stdout.
 func (result Result) Download(ctx context.Context, filter string) (*DownloadResult, error) {
-	return result.DownloadWithOptions(ctx, DownloadOptions{
-		Filter: filter,
-	})
-}
-
-type DownloadOptions struct {
-	AudioFormats      string // --audio-formats Download audio using formats (best, aac, alac, flac, m4a, mp3, opus, vorbis, wav)
-	DownloadAudioOnly bool   // -x Download audio only from video
-	// Download format matched by filter (usually a format id or quality designator).
-	// If filter is empty, then youtube-dl will use its default format selector.
-	Filter string
-	// The index of the entry to download from the playlist that would be
-	// passed to youtube-dl via --playlist-items. The index value starts at 1
-	PlaylistIndex int
-}
-
-func (result Result) DownloadWithOptions(
-	ctx context.Context,
-	options DownloadOptions,
-) (*DownloadResult, error) {
 	debugLog := result.Options.DebugLog
 
-	if !result.Options.noInfoDownload {
-		if (result.Info.Type == "playlist" ||
-			result.Info.Type == "multi_video" ||
-			result.Info.Type == "channel") &&
-			options.PlaylistIndex == 0 {
-			return nil, fmt.Errorf(
-				"can't download a playlist when the playlist index options is not set",
-			)
-		}
+	if result.Info.Type == "playlist" || result.Info.Type == "multi_video" {
+		return nil, fmt.Errorf("can't download a playlist")
 	}
 
-	tempPath, tempErr := os.MkdirTemp("", "ydls")
+	tempPath, tempErr := ioutil.TempDir("", "ydls")
 	if tempErr != nil {
 		return nil, tempErr
 	}
-
-	var jsonTempPath string
-	if !result.Options.noInfoDownload {
-		jsonTempPath = path.Join(tempPath, "info.json")
-		if err := os.WriteFile(jsonTempPath, result.RawJSON, 0600); err != nil {
-			os.RemoveAll(tempPath)
-			return nil, err
-		}
+	jsonTempPath := path.Join(tempPath, "info.json")
+	if err := ioutil.WriteFile(jsonTempPath, result.RawJSON, 0600); err != nil {
+		os.RemoveAll(tempPath)
+		return nil, err
 	}
 
 	dr := &DownloadResult{
@@ -627,68 +451,19 @@ func (result Result) DownloadWithOptions(
 
 	cmd := exec.CommandContext(
 		ctx,
-		ProbePath(),
-		// see comment below about ignoring errors for playlists
-		"--ignore-errors",
-		// TODO: deprecated in yt-dlp?
+		Path,
 		"--no-call-home",
-		// use non-fancy progress bar
+		"--no-cache-dir",
+		"--ignore-errors",
 		"--newline",
-		// use safer output filenmaes
-		// TODO: needed?
 		"--restrict-filenames",
-		// use .netrc authentication data
-		"--netrc",
-		// write to stdout
-		"--output", "-",
+		"--load-info", jsonTempPath,
+		"-o", "-",
 	)
-
-	if result.Options.noInfoDownload {
-		// provide URL via stdin for security, youtube-dl has some run command args
-		cmd.Args = append(cmd.Args, "--batch-file", "-")
-		cmd.Stdin = bytes.NewBufferString(result.RawURL + "\n")
-
-		if result.Options.Type == TypePlaylist {
-			cmd.Args = append(cmd.Args, "--yes-playlist")
-
-			if result.Options.PlaylistStart > 0 {
-				cmd.Args = append(cmd.Args,
-					"--playlist-start", strconv.Itoa(int(result.Options.PlaylistStart)),
-				)
-			}
-			if result.Options.PlaylistEnd > 0 {
-				cmd.Args = append(cmd.Args,
-					"--playlist-end", strconv.Itoa(int(result.Options.PlaylistEnd)),
-				)
-			}
-		} else {
-			cmd.Args = append(cmd.Args,
-				"--no-playlist",
-			)
-		}
-	} else {
-		cmd.Args = append(cmd.Args, "--load-info", jsonTempPath)
-	}
-	// force IPV4 Usage
-	if result.Options.UseIPV4 {
-		cmd.Args = append(cmd.Args, "-4")
-	}
 	// don't need to specify if direct as there is only one
 	// also seems to be issues when using filter with generic extractor
-	if !result.Info.Direct && options.Filter != "" {
-		cmd.Args = append(cmd.Args, "-f", options.Filter)
-	}
-
-	if options.PlaylistIndex > 0 {
-		cmd.Args = append(cmd.Args, "--playlist-items", fmt.Sprint(options.PlaylistIndex))
-	}
-
-	if options.DownloadAudioOnly {
-		cmd.Args = append(cmd.Args, "-x")
-	}
-
-	if options.AudioFormats != "" {
-		cmd.Args = append(cmd.Args, "--audio-format", options.AudioFormats)
+	if !result.Info.Direct {
+		cmd.Args = append(cmd.Args, "-f", filter)
 	}
 
 	if result.Options.ProxyUrl != "" {
@@ -699,46 +474,16 @@ func (result Result) DownloadWithOptions(
 		cmd.Args = append(cmd.Args, "--downloader", result.Options.Downloader)
 	}
 
-	if result.Options.DownloadSections != "" {
-		cmd.Args = append(cmd.Args, "--download-sections", result.Options.DownloadSections)
-	}
-
-	if result.Options.CookiesFromBrowser != "" {
-		cmd.Args = append(cmd.Args, "--cookies-from-browser", result.Options.CookiesFromBrowser)
-	}
-
-	if result.Options.MergeOutputFormat != "" {
-		cmd.Args = append(cmd.Args,
-			"--merge-output-format", result.Options.MergeOutputFormat,
-		)
-	}
-
-	if result.Options.SortingFormat != "" {
-		cmd.Args = append(cmd.Args,
-			"--format-sort", result.Options.SortingFormat,
-		)
-	}
-
-	if result.Options.ExtractorArgs != "" {
-		cmd.Args = append(cmd.Args,
-			"--extractor-args", result.Options.ExtractorArgs,
-		)
-	}
-
-	cmd.Args = append(cmd.Args, result.Options.DownloadArgs...)
-
 	cmd.Dir = tempPath
-	var stdoutW io.WriteCloser
-	var stderrW io.WriteCloser
-	var stderrR io.Reader
-	dr.reader, stdoutW = io.Pipe()
-	stderrR, stderrW = io.Pipe()
-	optStderrWriter := io.Discard
+	var w io.WriteCloser
+	dr.reader, w = io.Pipe()
+
+	stderrWriter := ioutil.Discard
 	if result.Options.StderrFn != nil {
-		optStderrWriter = result.Options.StderrFn(cmd)
+		stderrWriter = result.Options.StderrFn(cmd)
 	}
-	cmd.Stdout = stdoutW
-	cmd.Stderr = io.MultiWriter(optStderrWriter, stderrW)
+	cmd.Stdout = w
+	cmd.Stderr = stderrWriter
 
 	debugLog.Print("cmd", " ", cmd.Args)
 	if err := cmd.Start(); err != nil {
@@ -748,32 +493,12 @@ func (result Result) DownloadWithOptions(
 
 	go func() {
 		_ = cmd.Wait()
-		stdoutW.Close()
-		stderrW.Close()
+		w.Close()
 		os.RemoveAll(tempPath)
 		close(dr.waitCh)
 	}()
 
-	// blocks return until yt-dlp is downloading or has errored
-	ytErrCh := make(chan error)
-	go func() {
-		stderrLineScanner := bufio.NewScanner(stderrR)
-		for stderrLineScanner.Scan() {
-			const downloadPrefix = "[download]"
-			const errorPrefix = "ERROR: "
-			line := stderrLineScanner.Text()
-			if strings.HasPrefix(line, downloadPrefix) {
-				break
-			} else if strings.HasPrefix(line, errorPrefix) {
-				ytErrCh <- errors.New(line[len(errorPrefix):])
-				return
-			}
-		}
-		ytErrCh <- nil
-		_, _ = io.Copy(io.Discard, stderrR)
-	}()
-
-	return dr, <-ytErrCh
+	return dr, nil
 }
 
 func (dr *DownloadResult) Read(p []byte) (n int, err error) {

goutubedl_test.go

@@ -7,26 +7,25 @@ import (
 	"bytes"
 	"context"
 	"encoding/json"
-	"fmt"
 	"io"
-	"os"
 	"os/exec"
 	"regexp"
-	"strconv"
 	"strings"
 	"testing"
 
-	"gitea.kaz62.ru/dilap54/goutubedl"
 	"github.com/fortytw2/leaktest"
+	"github.com/wader/goutubedl"
 	"github.com/wader/osleaktest"
 )
 
-const (
-	testVideoRawURL          = "https://vimeo.com/454525548"
-	playlistRawURL           = "https://soundcloud.com/mattheis/sets/kindred-phenomena"
-	channelRawURL            = "https://www.youtube.com/channel/UCHDm-DKoMyJxKVgwGmuTaQA"
-	subtitlesTestVideoRawURL = "https://www.youtube.com/watch?v=QRS8MkLhQmM"
-)
+func init() {
+	// we're using yt-dlp at the moment
+	goutubedl.Path = "yt-dlp"
+}
+
+const testVideoRawURL = "https://www.youtube.com/watch?v=C0DPdy98e4c"
+const playlistRawURL = "https://soundcloud.com/mattheis/sets/kindred-phenomena"
+const subtitlesTestVideoRawURL = "https://www.youtube.com/watch?v=QRS8MkLhQmM"
 
 func leakChecks(t *testing.T) func() {
 	leakFn := leaktest.Check(t)
@@ -100,46 +99,14 @@ func TestDownload(t *testing.T) {
 	}
 }
 
-func TestDownloadWithoutInfo(t *testing.T) {
-	defer leakChecks(t)()
-
-	stderrBuf := &bytes.Buffer{}
-	dr, err := goutubedl.Download(context.Background(), testVideoRawURL, goutubedl.Options{
-		StderrFn: func(cmd *exec.Cmd) io.Writer {
-			return stderrBuf
-		},
-	}, "")
-	if err != nil {
-		t.Fatal(err)
-	}
-	downloadBuf := &bytes.Buffer{}
-	n, err := io.Copy(downloadBuf, dr)
-	if err != nil {
-		t.Fatal(err)
-	}
-	dr.Close()
-
-	if n != int64(downloadBuf.Len()) {
-		t.Errorf("copy n not equal to download buffer: %d!=%d", n, downloadBuf.Len())
-	}
-
-	if n < 10000 {
-		t.Errorf("should have copied at least 10000 bytes: %d", n)
-	}
-
-	if !strings.Contains(stderrBuf.String(), "Destination") {
-		t.Errorf("did not find expected log message on stderr: %q", stderrBuf.String())
-	}
-}
-
 func TestParseInfo(t *testing.T) {
 	for _, c := range []struct {
 		url           string
 		expectedTitle string
 	}{
 		{"https://soundcloud.com/avalonemerson/avalon-emerson-live-at-printworks-london-march-2017", "Avalon Emerson Live at Printworks London 2017"},
-		{"https://www.infoq.com/presentations/Simple-Made-Easy", "Simple Made Easy - InfoQ"},
-		{"https://vimeo.com/454525548", "Sample Video - 3 minutemp4.mp4"},
+		{"https://www.infoq.com/presentations/Simple-Made-Easy", "Simple Made Easy"},
+		{"https://www.youtube.com/watch?v=uVYWQJ5BB_w", "A Radiolab Producer on the Making of a Podcast"},
 	} {
 		t.Run(c.url, func(t *testing.T) {
 			defer leakChecks(t)()
@@ -220,40 +187,6 @@ func TestPlaylist(t *testing.T) {
 	}
 }
 
-func TestChannel(t *testing.T) {
-	t.Skip("skip youtube for now")
-
-	defer leakChecks(t)()
-
-	ydlResult, ydlResultErr := goutubedl.New(
-		context.Background(),
-		channelRawURL,
-		goutubedl.Options{
-			Type:              goutubedl.TypeChannel,
-			DownloadThumbnail: false,
-		},
-	)
-
-	if ydlResultErr != nil {
-		t.Errorf("failed to download: %s", ydlResultErr)
-	}
-
-	expectedTitle := "Simon Yapp"
-	if ydlResult.Info.Title != expectedTitle {
-		t.Errorf("expected title %q got %q", expectedTitle, ydlResult.Info.Title)
-	}
-
-	expectedEntries := 5
-	if len(ydlResult.Info.Entries) != expectedEntries {
-		t.Errorf("expected %d entries got %d", expectedEntries, len(ydlResult.Info.Entries))
-	}
-
-	expectedTitleOne := "#RNLI Shoreham #LifeBoat demo of launch."
-	if ydlResult.Info.Entries[0].Title != expectedTitleOne {
-		t.Errorf("expected title %q got %q", expectedTitleOne, ydlResult.Info.Entries[0].Title)
-	}
-}
-
 func TestUnsupportedURL(t *testing.T) {
 	defer leaktest.Check(t)()
 
@@ -269,8 +202,6 @@ func TestUnsupportedURL(t *testing.T) {
 }
 
 func TestPlaylistWithPrivateVideo(t *testing.T) {
-	t.Skip("skip youtube for now")
-
 	defer leaktest.Check(t)()
 
 	playlistRawURL := "https://www.youtube.com/playlist?list=PLX0g748fkegS54oiDN4AXKl7BR7mLIydP"
@@ -291,8 +222,6 @@ func TestPlaylistWithPrivateVideo(t *testing.T) {
 }
 
 func TestSubtitles(t *testing.T) {
-	t.Skip("skip youtube for now")
-
 	defer leakChecks(t)()
 
 	ydlResult, ydlResultErr := goutubedl.New(
@@ -324,73 +253,6 @@ func TestSubtitles(t *testing.T) {
 	}
 }
 
-func TestDownloadSections(t *testing.T) {
-	defer leakChecks(t)()
-
-	fileName := "durationTestingFile"
-	duration := 5
-
-	cmd := exec.Command("ffmpeg", "-version")
-	_, err := cmd.Output()
-	if err != nil {
-		t.Errorf("failed to check ffmpeg installed: %s", err)
-	}
-
-	ydlResult, ydlResultErr := goutubedl.New(
-		context.Background(),
-		"https://vimeo.com/454525548",
-		goutubedl.Options{
-			DownloadSections: fmt.Sprintf("*0:0-0:%d", duration),
-		})
-
-	if ydlResult.Options.DownloadSections != "*0:0-0:5" {
-		t.Errorf("failed to setup --download-sections")
-	}
-	if ydlResultErr != nil {
-		t.Errorf("failed to download: %s", ydlResultErr)
-	}
-	dr, err := ydlResult.Download(context.Background(), "")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	f, err := os.Create(fileName)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer f.Close()
-	_, err = io.Copy(f, dr)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	cmd = exec.Command("ffprobe", "-v", "quiet", "-show_entries", "format=duration", fileName)
-	stdout, err := cmd.Output()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	var gotDurationString string
-	output := string(stdout)
-	for _, line := range strings.Split(output, "\n") {
-		if strings.Contains(line, "duration") {
-			if d, found := strings.CutPrefix(line, "duration="); found {
-				gotDurationString = d
-			}
-		}
-	}
-
-	gotDuration, err := strconv.ParseFloat(gotDurationString, 32)
-	if err != nil {
-		t.Fatal(err)
-	}
-	seconds := int(gotDuration)
-	if seconds != duration {
-		t.Fatalf("did not get expected duration of %d, but got %d", duration, seconds)
-	}
-	dr.Close()
-}
-
 func TestErrorNotAPlaylist(t *testing.T) {
 	defer leakChecks(t)()
 
@@ -439,150 +301,3 @@ func TestOptionDownloader(t *testing.T) {
 	}
 	dr.Close()
 }
-
-func TestInvalidOptionTypeField(t *testing.T) {
-	defer leakChecks(t)()
-
-	_, err := goutubedl.New(context.Background(), playlistRawURL, goutubedl.Options{
-		Type: 42,
-	})
-	if err == nil {
-		t.Error("should have failed")
-	}
-}
-
-func TestDownloadPlaylistEntry(t *testing.T) {
-	defer leakChecks(t)()
-	// Download file by specifying the playlist index
-	stderrBuf := &bytes.Buffer{}
-	r, err := goutubedl.New(context.Background(), playlistRawURL, goutubedl.Options{
-		StderrFn: func(cmd *exec.Cmd) io.Writer {
-			return stderrBuf
-		},
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	expectedTitle := "Kindred Phenomena"
-	if r.Info.Title != expectedTitle {
-		t.Errorf("expected title %q got %q", expectedTitle, r.Info.Title)
-	}
-
-	expectedEntries := 8
-	if len(r.Info.Entries) != expectedEntries {
-		t.Errorf("expected %d entries got %d", expectedEntries, len(r.Info.Entries))
-	}
-
-	expectedTitleOne := "B1 Mattheis - Ben M"
-	playlistIndex := 2
-	if r.Info.Entries[playlistIndex].Title != expectedTitleOne {
-		t.Errorf("expected title %q got %q", expectedTitleOne, r.Info.Entries[playlistIndex].Title)
-	}
-
-	dr, err := r.DownloadWithOptions(context.Background(), goutubedl.DownloadOptions{
-		PlaylistIndex: int(r.Info.Entries[playlistIndex].PlaylistIndex),
-		Filter:        r.Info.Entries[playlistIndex].Formats[0].FormatID,
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-	playlistBuf := &bytes.Buffer{}
-	n, err := io.Copy(playlistBuf, dr)
-	if err != nil {
-		t.Fatal(err)
-	}
-	dr.Close()
-
-	if n != int64(playlistBuf.Len()) {
-		t.Errorf("copy n not equal to download buffer: %d!=%d", n, playlistBuf.Len())
-	}
-
-	if n < 10000 {
-		t.Errorf("should have copied at least 10000 bytes: %d", n)
-	}
-
-	if !strings.Contains(stderrBuf.String(), "Destination") {
-		t.Errorf("did not find expected log message on stderr: %q", stderrBuf.String())
-	}
-
-	// Download the same file but with the direct link
-	url := "https://soundcloud.com/mattheis/b1-mattheis-ben-m"
-	stderrBuf = &bytes.Buffer{}
-	r, err = goutubedl.New(context.Background(), url, goutubedl.Options{
-		StderrFn: func(cmd *exec.Cmd) io.Writer {
-			return stderrBuf
-		},
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if r.Info.Title != expectedTitleOne {
-		t.Errorf("expected title %q got %q", expectedTitleOne, r.Info.Title)
-	}
-
-	expectedEntries = 0
-	if len(r.Info.Entries) != expectedEntries {
-		t.Errorf("expected %d entries got %d", expectedEntries, len(r.Info.Entries))
-	}
-
-	dr, err = r.Download(context.Background(), r.Info.Formats[0].FormatID)
-	if err != nil {
-		t.Fatal(err)
-	}
-	directLinkBuf := &bytes.Buffer{}
-	n, err = io.Copy(directLinkBuf, dr)
-	if err != nil {
-		t.Fatal(err)
-	}
-	dr.Close()
-
-	if n != int64(directLinkBuf.Len()) {
-		t.Errorf("copy n not equal to download buffer: %d!=%d", n, directLinkBuf.Len())
-	}
-
-	if n < 10000 {
-		t.Errorf("should have copied at least 10000 bytes: %d", n)
-	}
-
-	if !strings.Contains(stderrBuf.String(), "Destination") {
-		t.Errorf("did not find expected log message on stderr: %q", stderrBuf.String())
-	}
-
-	if directLinkBuf.Len() != playlistBuf.Len() {
-		t.Errorf("not the same content size between the playlist index entry and the direct link entry: %d != %d", playlistBuf.Len(), directLinkBuf.Len())
-	}
-
-	if !bytes.Equal(directLinkBuf.Bytes(), playlistBuf.Bytes()) {
-		t.Error("not the same content between the playlist index entry and the direct link entry")
-	}
-}
-
-func TestFormatDownloadError(t *testing.T) {
-	t.Skip("test URL broken")
-
-	defer leaktest.Check(t)()
-
-	ydl, ydlErr := goutubedl.New(
-		context.Background(),
-		"https://www.reddit.com/r/newsbabes/s/92rflI0EB0",
-		goutubedl.Options{},
-	)
-
-	if ydlErr != nil {
-		// reddit seems to not like github action hosts
-		if strings.Contains(ydlErr.Error(), "HTTPError 403: Blocked") {
-			t.Skip()
-		}
-		t.Error(ydlErr)
-	}
-
-	// no pre-muxed audio/video format available
-	_, ytDlErr := ydl.Download(context.Background(), "best")
-	expectedErr := "Requested format is not available"
-	if ydlErr != nil && !strings.Contains(ytDlErr.Error(), expectedErr) {
-		t.Errorf("expected error prefix %q got %q", expectedErr, ytDlErr.Error())
-
-	}
-}