dilap54/goutubedl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add --ignore-errors for info download also

Browse Source 
--ignore-errors still return error message and exit code != 0
so workaround is to assume things went ok if we get some json on stdout

Filter out failed entries for playlists
This commit is contained in:
Mattias Wadman
2019-09-22 23:03:20 +02:00
parent 8705585522
commit 47b4e26567
2 changed files with 41 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
goutubedl.go
View File

@ -217,6 +217,7 @@ func infoFromURL(ctx context.Context, rawURL string, options Options) (info Info
Path,
"--no-call-home",
"--no-cache-dir",
"--ignore-errors",
"--skip-download",
"--restrict-filenames",
// provide URL via stdin for security, youtube-dl has some run command args
@ -275,10 +276,14 @@ func infoFromURL(ctx context.Context, rawURL string, options Options) (info Info
}
}
if errMessage != "" {
return Info{}, nil, Error(errMessage)
} else if cmdErr != nil {
return Info{}, nil, cmdErr
// HACK: --ignore-errors still return error message and exit code != 0
// so workaround is to assume things went ok if we get some json on stdout
if len(stdoutBuf.Bytes()) == 0 {
if errMessage != "" {
return Info{}, nil, Error(errMessage)
} else if cmdErr != nil {
return Info{}, nil, cmdErr
}
}
if infoErr := json.Unmarshal(stdoutBuf.Bytes(), &info); infoErr != nil {
@ -318,6 +323,18 @@ func infoFromURL(ctx context.Context, rawURL string, options Options) (info Info
}
}
// as we ignore errors some entries might show up as null
if options.YesPlaylist {
var filteredEntrise []Info
for _, e := range info.Entries {
if e.ID == "" {
continue
}
filteredEntrise = append(filteredEntrise, e)
}
info.Entries = filteredEntrise
}
return info, stdoutBuf.Bytes(), nil
}