Fix youtube lua (BASE_YT_URL had not been converted to new format)

[vlc] / share / luaplaylist / youtube.lua

diff --git a/share/luaplaylist/youtube.lua b/share/luaplaylist/youtube.lua
index 2e16c277d156ec481e8f637abe82bd4e1010ee83..ea1a6134af58df6913be575fd65c6528a5ddb2d2 100644 (file)
--- a/share/luaplaylist/youtube.lua
+++ b/share/luaplaylist/youtube.lua
@@ -70,12 +70,13 @@ function parse()
             if string.match( line, "subscribe_to_user=" ) then
                 artist = string.gsub( line, ".*subscribe_to_user=([^&]*).*", "%1" )
             end
-            -- var swfArgs = {hl:'en',BASE_YT_URL:'http://youtube.com/',video_id:'XPJ7d8dq0t8',l:'292',t:'OEgsToPDskLFdOYrrlDm3FQPoQBYaCP1',sk:'0gnr-AE6QZJEZmCMd3lq_AC'};
+            -- OLD: var swfArgs = {hl:'en',BASE_YT_URL:'http://youtube.com/',video_id:'XPJ7d8dq0t8',l:'292',t:'OEgsToPDskLFdOYrrlDm3FQPoQBYaCP1',sk:'0gnr-AE6QZJEZmCMd3lq_AC'};
+            -- NEW: var swfArgs = { "BASE_YT_URL": "http://youtube.com", "video_id": "OHVvVmUNBFc", "l": 88, "sk": "WswKuJzDBsdD6oG3IakCXgC", "t": "OEgsToPDskK3zO44y0QN8Fr5ZSAZwCQp", "plid": "AARGnwWMrmGkbpOxAAAA4AT4IAA", "tk": "mEL4E7PqHeaZp5OG19NQThHt9mXJU4PbRTOw6lz9osHi4Hixp7RE1w=="};
             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" )
+                    base_yt_url = string.gsub( line, ".*\"BASE_YT_URL\": \"([^\"]*).*", "%1" )
                 end
-                t = string.gsub( line, ".*t:'([^']*)'.*", "%1" )
+                t = string.gsub( line, ".*\"t\": \"([^\"]*).*", "%1" )
                 -- vlc.msg_err( t )
                 -- video_id = string.gsub( line, ".*&video_id:'([^']*)'.*", "%1" )
             end
@@ -87,7 +88,7 @@ function parse()
         if not base_yt_url then
             base_yt_url = "http://youtube.com/"
         end
-        art_url = get_arturl( vlc.path, video_id )
+        arturl = 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
@@ -99,7 +100,7 @@ function parse()
             name = get_url_param( vlc.path, "title" )
         end
         video_id = get_url_param( vlc.path, "video_id" )
-        art_url = get_arturl( vlc.path, video_id )
+        arturl = 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