Commit 416d829b authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Lua: support HTTPS and live for Dailymotion

Close #12753

Thanks to Ruito

(cherry picked from commit fcef78e37a5bffd23693e898ab5ff41a0d8a6d51)
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 2c878ef8
...@@ -29,68 +29,88 @@ function get_prefres() ...@@ -29,68 +29,88 @@ function get_prefres()
prefres = -1 prefres = -1
end end
end end
return prefres return prefres
end end
-- Probe function. -- Probe function.
function probe() function probe()
return vlc.access == "http" if vlc.access ~= "http" and vlc.access ~= "https" then
and string.match( vlc.path, "www.dailymotion.com/video" ) return false
end end
function find( haystack, needle ) return ( string.match( vlc.path, "www.dailymotion.com/video" ) )
local _,_,ret = string.find( haystack, needle )
return ret
end end
-- Parse function. -- Parse function.
function parse() function parse()
prefres = get_prefres() prefres = get_prefres()
while true while true
do do
line = vlc.readline() line = vlc.readline()
if not line then if not line then break end
break if string.match( line, "<meta property=\"og:title\"" ) then
end _,_,name = string.find( line, "content=\"(.-)\"" )
if string.match( line, "sequence=") name = vlc.strings.resolve_xml_special_chars( name )
then
line = vlc.strings.decode_uri(line):gsub("\\/", "/")
arturl = find( line, "\"videoPreviewURL\":\"([^\"]*)\"")
name = find( line, "\"videoTitle\":\"([^\"]*)\"")
if name then
name = string.gsub( name, "+", " " )
end end
description = find( line, "\"videoDescription\":\"([^\"]*)\"") if string.match( line, "<meta name=\"description\"" ) then
if description then _,_,description = string.find( line, "content=\"(.-)\"" )
description = string.gsub( description, "+", " " ) if (description ~= nil) then
description = vlc.strings.resolve_xml_special_chars( description )
end end
for _,param in ipairs({ "hd1080URL", "hd720URL", "hqURL", "sdURL", "video_url" }) do
path = string.match( line, "\""..param.."\":\"([^\"]*)\"" )
if path then
path = vlc.strings.decode_uri(path)
if prefres < 0 then
break
end end
height = string.match( path, "/cdn/%w+%-%d+x(%d+)/video/" ) if string.match( line, "<meta name=\"author\"" ) then
if not height then _,_,artist = string.find( line, "content=\"(.-)\"" )
height = string.match( param, "(%d+)" ) artist = vlc.strings.resolve_xml_special_chars( artist )
end
if not height or tonumber(height) <= prefres then
break
end end
if string.match( line, "<link rel=\"thumbnail\" type=\"image/jpeg\"" ) then
_,_,arturl = string.find( line, "href=\"(.-)\"" )
end end
end end
if not path then page_embed = string.gsub(vlc.path, "dailymotion.com/video/", "dailymotion.com/embed/video/")
page_url = vlc.stream(vlc.access .. "://" .. page_embed )
if not page_url then return nil end
page = page_url:read( 65653 )
hd1080url = string.match( page, "\"stream_h264_hd1080_url\"%s*:%s*\"([^\"]*)\"")
hdurl = string.match( page, "\"stream_h264_hd_url\"%s*:%s*\"([^\"]*)\"")
hqurl = string.match( page, "\"stream_h264_hq_url\"%s*:%s*\"([^\"]*)\"")
baseurl = string.match( page, "\"stream_h264_url\"%s*:%s*\"([^\"]*)\"")
ldurl = string.match( page, "\"stream_h264_ld_url\"%s*:%s*\"([^\"]*)\"")
livehlsurl = string.match( page, "\"stream_live_hls_url\"%s*:%s*\"([^\"]*)\"")
arr_videos_urls = {}
if hd1080url then table.insert(arr_videos_urls,hd1080url) end
if hdurl then table.insert(arr_videos_urls,hdurl) end
if hqurl then table.insert(arr_videos_urls,hqurl) end
if baseurl then table.insert(arr_videos_urls,baseurl) end
if ldurl then table.insert(arr_videos_urls,baseurl) end
if livehlsurl then
return { { path = livehlsurl:gsub("\\/", "/"); name = name; description = description; url = vlc.path; arturl = arturl ; artist = artist} }
else
if table.getn(arr_videos_urls) > 0 then
for i=1 , table.getn(arr_videos_urls) do
video_url_out = arr_videos_urls[i]:gsub("\\/", "/")
if prefres < 0 then
break break
end end
height = string.match( video_url_out, "/cdn/%w+%-%d+x(%d+)/video/" )
return { { path = path; name = name; description = description; url = vlc.path; arturl = arturl } } if not height or tonumber(height) <= prefres then
break
end end
end end
return { { path = video_url_out; name = name; description = description; url = vlc.path; arturl = arturl; artist = artist} }
else
vlc.msg.err("Couldn't extract the video URL from dailymotion") vlc.msg.err("Couldn't extract the video URL from dailymotion")
return { } return { }
end
end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment