Set metadata and fix dl path

master v0.3
bel 2020-02-01 20:03:47 +00:00
parent cb0eea6140
commit 20326f2f39
2 changed files with 34 additions and 8 deletions

View File

@ -57,7 +57,7 @@ func do(client *youtubedl.Client) error {
log.Printf("already exists: %s", target) log.Printf("already exists: %s", target)
continue continue
} }
if err := client.Download(result.Link, path.Join(config.Root, target)); err != nil { if err := client.Download(result.Link, target); err != nil {
errs += ", " + err.Error() errs += ", " + err.Error()
} }
} }

View File

@ -15,15 +15,41 @@ func New() (*Client, error) {
} }
func (c *Client) Download(video, local string) error { func (c *Client) Download(video, local string) error {
cmd := exec.Command("youtube-dl", "-f", "22", "-o", local, "--write-sub", "--write-auto-sub", "--sub-format", "srt", video) errs := []error{}
for _, extras := range [][]string{
[]string{"--metadata-from-title", ".*[0-9]/[0-9][0-9] (?P<title>.+)"},
[]string{},
} {
args := append([]string{
"youtube-dl",
"-f",
"22",
"-o",
local,
"--write-sub",
"--write-auto-sub",
"--sub-format",
"srt",
}, extras...)
args = append(args, video)
cmd := exec.Command(args[0], args[1:]...)
log.Println(cmd.Path, cmd.Args) log.Println(cmd.Path, cmd.Args)
out, err := cmd.CombinedOutput() out, err := cmd.CombinedOutput()
if err != nil { if err != nil {
err = fmt.Errorf("%v: %s", err, out) log.Printf("failed with %v: %s", err, out)
errs = append(errs, fmt.Errorf("%v: %s", err, out))
} else {
log.Printf("passed with %s", out)
errs = nil
break
}
}
if len(errs) > 0 {
err := fmt.Errorf("%v", errs)
return err return err
} }
cmd = exec.Command("python3", "-m", "vtt_to_srt", path.Dir(local)) cmd := exec.Command("python3", "-m", "vtt_to_srt", path.Dir(local))
out, err = cmd.CombinedOutput() out, err := cmd.CombinedOutput()
if err != nil { if err != nil {
err = fmt.Errorf("%v: %s", err, out) err = fmt.Errorf("%v: %s", err, out)
return err return err