Compare commits

...

2 Commits
v0.9 ... master

Author SHA1 Message Date
Bel LaPointe 53d7c826ef youtube-dl to yt-dlp 2021-08-23 17:30:07 -04:00
Bel LaPointe d256ad7916 test via manual and $TEST 2021-05-14 09:32:41 -04:00
2 changed files with 32 additions and 7 deletions

View File

@ -3,6 +3,7 @@ package youtubedl
import ( import (
"fmt" "fmt"
"log" "log"
"os"
"os/exec" "os/exec"
"path" "path"
) )
@ -15,13 +16,17 @@ func New() (*Client, error) {
} }
func (c *Client) Download(video, local string) error { func (c *Client) Download(video, local string) error {
if _, ok := os.LookupEnv("TEST"); ok {
log.Println("youtube-dl download", video, local)
return nil
}
errs := []error{} errs := []error{}
for _, extras := range [][]string{ for _, extras := range [][]string{
[]string{"--add-metadata", "--metadata-from-title", ".*[0-9]/[0-9][0-9] (?P<title>.+)"}, []string{"--add-metadata", "--metadata-from-title", ".*[0-9]/[0-9][0-9] (?P<title>.+)"},
[]string{}, []string{},
} { } {
args := append([]string{ args := append([]string{
"youtube-dl", "/tmp/yt-dlp",
"-f", "-f",
"22", "22",
"-o", "-o",
@ -30,6 +35,7 @@ func (c *Client) Download(video, local string) error {
"--write-auto-sub", "--write-auto-sub",
"--sub-format", "--sub-format",
"srt", "srt",
"--no-check-certificate",
}, extras...) }, extras...)
args = append(args, video) args = append(args, video)
cmd := exec.Command(args[0], args[1:]...) cmd := exec.Command(args[0], args[1:]...)

View File

@ -2,11 +2,16 @@ package youtubedl
import ( import (
"errors" "errors"
"fmt"
"log" "log"
"os"
"os/exec" "os/exec"
) )
func install() error { func install() error {
if _, ok := os.LookupEnv("TEST"); ok {
return nil
}
if err := installPyPip3FFMPEG(); err != nil { if err := installPyPip3FFMPEG(); err != nil {
return err return err
} }
@ -48,16 +53,30 @@ func installPyPip3FFMPEG() error {
} }
func installYtdl() error { func installYtdl() error {
cmd := exec.Command("youtube-dl", "--version") cmd := exec.Command("/tmp/yt-dlp", "--version")
if err := cmd.Run(); err == nil { if err := cmd.Run(); err == nil {
return err return err
} }
cmd = exec.Command("sudo", "pip3", "install", "youtube-dl") os.Remove("/tmp/yt-dlp")
cmd = exec.Command(
"wget",
"https://github.com/yt-dlp/yt-dlp/releases/latest/download/yt-dlp",
"--no-check-certificate",
"-O",
"/tmp/yt-dlp",
)
if err := cmd.Run(); err != nil { if err := cmd.Run(); err != nil {
cmd = exec.Command("pip3", "install", "youtube-dl") o, _ := cmd.CombinedOutput()
if err := cmd.Run(); err != nil { return fmt.Errorf("failed wget yt-dlp: %v: %s", err, o)
return err }
} cmd = exec.Command(
"chmod",
"a+rx",
"/tmp/yt-dlp",
)
if err := cmd.Run(); err != nil {
o, _ := cmd.CombinedOutput()
return fmt.Errorf("failed chmod yt-dlp: %v: %s", err, o)
} }
return nil return nil
} }