Commit a117ab7f authored by Antoine Cellerier's avatar Antoine Cellerier

Attempt to fix youtube demux script. I still get connections errors towards...

Attempt to fix youtube demux script. I still get connections errors towards youtube but i wanted to commit what i'd already done since i'll be gone for a week.
parent aee385ff
...@@ -2,17 +2,28 @@ ...@@ -2,17 +2,28 @@
-- Helper function to get a parameter's value in a URL -- Helper function to get a parameter's value in a URL
function get_url_param( url, name ) function get_url_param( url, name )
return string.gsub( vlc.path, "^.*"..name.."=([^&]*).*$", "%1" ) return string.gsub( url, "^.*[&?]"..name.."=([^&]*).*$", "%1" )
end
function get_arturl( path, video_id )
if string.match( vlc.path, "iurl=" ) then
return vlc.decode_uri( get_url_param( vlc.path, "iurl" ) )
end
if not arturl then
return "http://img.youtube.com/vi/"..video_id.."/default.jpg"
end
end end
-- Probe function. -- Probe function.
function probe() function probe()
return vlc.access == "http" return vlc.access == "http"
and string.match( vlc.path, "youtube.com" ) and string.match( vlc.path, "youtube.com" )
and ( string.match( vlc.path, "watch%?v=" ) and ( string.match( vlc.path, "watch%?v=" ) -- the html page
or string.match( vlc.path, "watch_fullscreen%?video_id=" ) or string.match( vlc.path, "watch_fullscreen%?video_id=" ) -- the fullscreen page
or string.match( vlc.path, "p.swf" ) or string.match( vlc.path, "p.swf" ) -- the (old?) player url
or string.match( vlc.path, "player2.swf" ) ) or string.match( vlc.path, "jp.swf" ) -- the (new?) player url (as of 24/08/2007)
or string.match( vlc.path, "player2.swf" ) ) -- another player url
or ( string.match( vlc.path, "get_video%?video_id=" ) and not string.match( vlc.path, "t=" ) ) -- the video url without the t= parameter which is mandatory (since 24/08/2007)
end end
-- Parse function. -- Parse function.
...@@ -32,16 +43,41 @@ function parse() ...@@ -32,16 +43,41 @@ function parse()
if string.match( line, "subscribe_to_user=" ) then if string.match( line, "subscribe_to_user=" ) then
artist = string.gsub( line, ".*subscribe_to_user=([^&]*).*", "%1" ) artist = string.gsub( line, ".*subscribe_to_user=([^&]*).*", "%1" )
end end
if string.match( line, "player2.swf" ) then -- var swfArgs = {hl:'en',BASE_YT_URL:'http://youtube.com/',video_id:'XPJ7d8dq0t8',l:'292',t:'OEgsToPDskLFdOYrrlDm3FQPoQBYaCP1',sk:'0gnr-AE6QZJEZmCMd3lq_AC'};
video_id = string.gsub( line, ".*&video_id=([^\"]*).*", "%1" ) if string.match( line, "swfArgs" ) and string.match( line, "video_id" ) then
if string.match( line, "BASE_YT_URL" ) then
base_yt_url = string.gsub( line, ".*BASE_YT_URL:'([^']*)'.*", "%1" )
end
t = string.gsub( line, ".*t:'([^']*)'.*", "%1" )
vlc.msg_err( t )
-- video_id = string.gsub( line, ".*&video_id:'([^']*)'.*", "%1" )
end end
if name and description and artist and video_id then break end if name and description and artist --[[and video_id]] then break end
end
if not video_id then
video_id = get_url_param( vlc.path, "v" )
end
if not base_yt_url then
base_yt_url = "http://youtube.com/"
end
art_url = get_arturl( vlc.path, video_id )
if t then
return { { path = base_yt_url .. "get_video?video_id="..video_id.."&t="..t; name = name; description = description; artist = artist; arturl = arturl } }
else
-- This shouldn't happen ... but keep it as a backup.
return { { path = "http://www.youtube.com/v/"..video_id; name = name; description = description; artist = artist; arturl = arturl } }
end end
return { { path = "http://www.youtube.com/get_video.php?video_id="..video_id; name = name; description = description; artist = artist } }
else -- This is the flash player's URL else -- This is the flash player's URL
if string.match( vlc.path, "title=" ) then if string.match( vlc.path, "title=" ) then
name = get_url_param( vlc.path, "title" ) name = get_url_param( vlc.path, "title" )
end end
return { { path = "http://www.youtube.com/get_video.php?video_id="..get_url_param( vlc.path, "video_id" ).."&t="..get_url_param( vlc.patch, "t" ); name = name } } video_id = get_url_param( vlc.path, "video_id" )
art_url = get_arturl( vlc.path, video_id )
if not string.match( vlc.path, "t=" ) then
-- This sucks, we're missing "t" which is now mandatory. Let's
-- try using another url
return { { path = "http://www.youtube.com/v/"..video_id; name = name; arturl = arturl } }
end
return { { path = "http://www.youtube.com/get_video.php?video_id="..video_id.."&t="..get_url_param( vlc.path, "t" ); name = name; arturl = arturl } }
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