RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-01-30 19:52:14 +00:00
Code Issues Releases Wiki Activity

ytdl_hook: don't log error when loading is aborted

Browse Source
This commit is contained in:
wm4 2018-04-15 09:00:18 +02:00 committed by Jan Ekström
parent 987eecdb5a
commit c647516278
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
player/lua/ytdl_hook.lua
View File

@ -31,7 +31,7 @@ local safe_protos = Set {
local function exec(args)
local ret = utils.subprocess({args = args})
return ret.status, ret.stdout, ret
return ret.status, ret.stdout, ret, ret.killed_by_us
end
-- return true if it was explicitly set on the command line
@ -502,7 +502,11 @@ mp.add_hook(o.try_ytdl_first and "on_load" or "on_load_fail", 10, function ()
table.insert(command, "--")
table.insert(command, url)
msg.debug("Running: " .. table.concat(command,' '))
local es, json, result = exec(command)
local es, json, result, aborted = exec(command)
if aborted then
return
end
if (es < 0) or (json == nil) or (json == "") then
local err = "youtube-dl failed: "