From fa9ccb8f1ae918def767c64098ebab5a0e2b02d8 Mon Sep 17 00:00:00 2001 From: Toni Gundogdu Date: Sun, 5 Aug 2012 17:48:39 +0300 Subject: [PATCH] media/youtube.lua: Rewrite begin_param function Make the pattern more flexible, e.g. if the "%d+m" was missing, parsing of the seconds would still work. --- share/lua/media/youtube.lua | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/share/lua/media/youtube.lua b/share/lua/media/youtube.lua index 07f227e..9601952 100644 --- a/share/lua/media/youtube.lua +++ b/share/lua/media/youtube.lua @@ -91,18 +91,16 @@ end -- Appends the &begin parameter to the media stream URL. function YouTube.append_begin_param(qargs) - local m,s = qargs.input_url:match("t=(%d+)m(%d+)s") - if m or s then - m = tonumber(m) or 0 - s = tonumber(s) or 0 - local ms = (m*60000) + (s*1000) - if ms >0 then - for i,v in ipairs(qargs.streams) do - local url = qargs.streams[i].url - qargs.streams[i].url = url .."&begin=".. ms - end - qargs.start_time_ms = ms + local m,s = qargs.input_url:match('t=(%d?%d?m?)(%d%d)s') + m = tonumber(((m or ''):gsub('%a',''))) or 0 + s = tonumber(((s or ''):gsub('%a',''))) or 0 + local ms = (m*60000) + (s*1000) + if ms >0 then + for i,v in ipairs(qargs.streams) do + local url = qargs.streams[i].url + qargs.streams[i].url = url .."&begin=".. ms end + qargs.start_time_ms = ms end end -- 2.11.4.GIT