diff --git a/.gitignore b/.gitignore
index 324ccec..5f622e9 100755
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
ytubeSpdrun
**/*.sw*
+exec-*
youtuber
diff --git a/youtubedl/client.go b/youtubedl/client.go
index bb03696..8de188c 100755
--- a/youtubedl/client.go
+++ b/youtubedl/client.go
@@ -17,7 +17,7 @@ func New() (*Client, error) {
func (c *Client) Download(video, local string) error {
errs := []error{}
for _, extras := range [][]string{
- []string{"--metadata-from-title", ".*[0-9]/[0-9][0-9] (?P
.+)"},
+ []string{"--add-metadata", "--metadata-from-title", ".*[0-9]/[0-9][0-9] (?P.+)"},
[]string{},
} {
args := append([]string{
diff --git a/youtubedl/install.go b/youtubedl/install.go
index 52ea35c..87bdda5 100755
--- a/youtubedl/install.go
+++ b/youtubedl/install.go
@@ -7,7 +7,7 @@ import (
)
func install() error {
- if err := installPyPip3(); err != nil {
+ if err := installPyPip3FFMPEG(); err != nil {
return err
}
if err := installYtdl(); err != nil {
@@ -19,21 +19,23 @@ func install() error {
return nil
}
-func installPyPip3() error {
+func installPyPip3FFMPEG() error {
hasPy := exec.Command("python3", "--version")
hasPip := exec.Command("pip3", "--version")
+ hasFFMPEG := exec.Command("which", "ffmpeg")
if err := hasPy.Run(); err != nil {
} else if err := hasPip.Run(); err != nil {
+ } else if err := hasFFMPEG.Run(); err != nil {
} else {
return nil
}
for _, combo := range [][]string{
- []string{"sudo", "apt", "install", "python3", "pip3"},
- []string{"apt", "install", "python3", "pip3"},
- []string{"apk", "add", "python3", "py3-pip"},
- []string{"sudo", "apk", "add", "python3", "py3-pip"},
- []string{"/sbin/apk", "add", "python3", "py3-pip"},
- []string{"sudo", "/sbin/apk", "add", "python3", "py3-pip"},
+ []string{"sudo", "apt", "install", "python3", "pip3", "ffmpeg"},
+ []string{"apt", "install", "python3", "pip3", "ffmpeg"},
+ []string{"apk", "add", "python3", "py3-pip", "ffmpeg"},
+ []string{"sudo", "apk", "add", "python3", "py3-pip", "ffmpeg"},
+ []string{"/sbin/apk", "add", "python3", "py3-pip", "ffmpeg"},
+ []string{"sudo", "/sbin/apk", "add", "python3", "py3-pip", "ffmpeg"},
} {
cmd := exec.Command(combo[0], combo[1:]...)
err := cmd.Run()
@@ -42,7 +44,7 @@ func installPyPip3() error {
}
log.Println("%v: %v", err, combo)
}
- return errors.New("cannot get python3 and pip3")
+ return errors.New("cannot get python3 and pip3 and ffmpeg")
}
func installYtdl() error {