From: Pierre Ynard <linkfanel@yahoo.fr>
Date: Sun, 7 Aug 2011 07:28:34 +0000 (+0200)
Subject: youtube.lua: more clean-up
X-Git-Tag: 1.2.0-pre1~1388
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=f8b1ac11f42233e6e1352f611f296f30112ad28d;hp=9cd79b70b2b87ed34f288944d172d94f45d5aa02;p=vlc

youtube.lua: more clean-up
---

diff --git a/share/lua/playlist/youtube.lua b/share/lua/playlist/youtube.lua
index 88b9055bf3..95a7a43281 100644
--- a/share/lua/playlist/youtube.lua
+++ b/share/lua/playlist/youtube.lua
@@ -24,13 +24,17 @@ function get_url_param( url, name )
     return res
 end
 
-function get_arturl( path, video_id )
-    if string.match( vlc.path, "iurl=" ) then
-        return vlc.strings( get_url_param( vlc.path, "iurl" ) )
-    end
-    if not arturl then
-        return "http://img.youtube.com/vi/"..video_id.."/default.jpg"
+function get_arturl()
+    -- FIXME: vlc.strings() is not a function, it should probably be
+    -- vlc.strings.decode_uri()
+    --if string.match( vlc.path, "iurl=" ) then
+    --    return vlc.strings( get_url_param( vlc.path, "iurl" ) )
+    --end
+    video_id = get_url_param( vlc.path, "v" )
+    if not video_id then
+        return nil
     end
+    return "http://img.youtube.com/vi/"..video_id.."/default.jpg"
 end
 
 -- Probe function.
@@ -106,8 +110,7 @@ function parse()
         end
 
         if not arturl then
-            video_id = get_url_param( vlc.path, "v" )
-            arturl = get_arturl( vlc.path, video_id )
+            arturl = get_arturl()
         end
 
         if not path then