Lua: youtube in HQ (when used with &fmt=18)

[vlc] / share / lua / playlist / youtube.lua

diff --git a/share/lua/playlist/youtube.lua b/share/lua/playlist/youtube.lua
index ea1a6134af58df6913be575fd65c6528a5ddb2d2..452400f16f81823f88c54283006ee3eaa24a0624 100644 (file)
--- a/share/lua/playlist/youtube.lua
+++ b/share/lua/playlist/youtube.lua
@@ -20,12 +20,13 @@
 
 -- Helper function to get a parameter's value in a URL
 function get_url_param( url, name )
-    return string.gsub( url, "^.*[&?]"..name.."=([^&]*).*$", "%1" )
+    local _, _, res = string.find( url, "[&?]"..name.."=([^&]*)" )
+    return res
 end
 
 function get_arturl( path, video_id )
     if string.match( vlc.path, "iurl=" ) then
-        return vlc.decode_uri( get_url_param( vlc.path, "iurl" ) )
+        return vlc.strings.decode_uri( get_url_param( vlc.path, "iurl" ) )
     end
     if not arturl then
         return "http://img.youtube.com/vi/"..video_id.."/default.jpg"
@@ -62,22 +63,23 @@ function parse()
             line = vlc.readline()
             if not line then break end
             if string.match( line, "<meta name=\"title\"" ) then
-                name = string.gsub( line, "^.*content=\"([^\"]*).*$", "%1" )
+                _,_,name = string.find( line, "content=\"(.-)\"" )
             end
             if string.match( line, "<meta name=\"description\"" ) then
-                description = string.gsub( line, "^.*content=\"([^\"]*).*$", "%1" )
+               -- Don't ask me why they double encode ...
+                _,_,description = vlc.strings.resolve_xml_special_chars(vlc.strings.resolve_xml_special_chars(string.find( line, "content=\"(.-)\"" )))
             end
             if string.match( line, "subscribe_to_user=" ) then
-                artist = string.gsub( line, ".*subscribe_to_user=([^&]*).*", "%1" )
+                _,_,artist = string.find( line, "subscribe_to_user=([^&]*)" )
             end
             -- 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.find( line, "\"BASE_YT_URL\": \"(.-)\"" )
                 end
-                t = string.gsub( line, ".*\"t\": \"([^\"]*).*", "%1" )
-                -- vlc.msg_err( t )
+                _,_,t = string.find( line, "\"t\": \"(.-)\"" )
+                -- vlc.msg.err( t )
                 -- video_id = string.gsub( line, ".*&video_id:'([^']*)'.*", "%1" )
             end
             if name and description and artist --[[and video_id]] then break end
@@ -89,8 +91,15 @@ function parse()
             base_yt_url = "http://youtube.com/"
         end
         arturl = get_arturl( vlc.path, video_id )
+        -- fmt is the format of the video: 18 is HQ (mp4)
+        fmt = get_url_param( vlc.path, "fmt" )
+        if fmt then
+            format = "&fmt=" .. fmt
+        else
+            format = ""
+        end
         if t then
-            return { { path = base_yt_url .. "get_video?video_id="..video_id.."&t="..t; name = name; description = description; artist = artist; arturl = arturl } }
+            return { { path = base_yt_url .. "get_video?video_id="..video_id.."&t="..t..format; 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 } }
@@ -101,11 +110,17 @@ function parse()
         end
         video_id = get_url_param( vlc.path, "video_id" )
         arturl = get_arturl( vlc.path, video_id )
+        fmt = get_url_param( vlc.path, "fmt" )
+        if fmt then
+            format = "&fmt=" .. fmt
+        else
+            format = ""
+        end
         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 } }
+        return { { path = "http://www.youtube.com/get_video.php?video_id="..video_id.."&t="..get_url_param( vlc.path, "t" )..format; name = name; arturl = arturl } }
     end
 end