vlc | branch: master | Marvin Scholz <epira...@gmail.com> | Tue Oct 25 10:14:49 2016 +0200| [4edf693b81288ac6181c3335a9acd1904c0beb77] | committer: Rémi Denis-Courmont
googlevideo.lua: Remove googlevideo script Remove the Google Video script as Google Video was shut down in 2012 with YouTube as a replacement. Signed-off-by: Rémi Denis-Courmont <r...@remlab.net> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4edf693b81288ac6181c3335a9acd1904c0beb77 --- share/Makefile.am | 2 - share/lua/playlist/README.txt | 2 +- share/lua/playlist/googlevideo.lua | 75 -------------------------------------- 3 files changed, 1 insertion(+), 78 deletions(-) diff --git a/share/Makefile.am b/share/Makefile.am index 5f47098..ecd7cda 100644 --- a/share/Makefile.am +++ b/share/Makefile.am @@ -144,7 +144,6 @@ nobase_vlclib_DATA = \ lua/playlist/dailymotion.luac \ lua/playlist/extreme.luac \ lua/playlist/france2.luac \ - lua/playlist/googlevideo.luac \ lua/playlist/jamendo.luac \ lua/playlist/joox.luac \ lua/playlist/katsomo.luac \ @@ -237,7 +236,6 @@ EXTRA_DIST += \ lua/playlist/dailymotion.lua \ lua/playlist/extreme.lua \ lua/playlist/france2.lua \ - lua/playlist/googlevideo.lua \ lua/playlist/jamendo.lua \ lua/playlist/joox.lua \ lua/playlist/katsomo.lua \ diff --git a/share/lua/playlist/README.txt b/share/lua/playlist/README.txt index b33832d..e3cafbc 100644 --- a/share/lua/playlist/README.txt +++ b/share/lua/playlist/README.txt @@ -3,7 +3,7 @@ $Id$ See lua/README.txt for generic documentation about Lua usage in VLC. -Examples: See dailymotion.lua, googlevideo.lua, metacafe.lua, youtube.lua +Examples: See dailymotion.lua, metacafe.lua, youtube.lua and youtube_homepage.lua . VLC Lua playlist modules should define two functions: diff --git a/share/lua/playlist/googlevideo.lua b/share/lua/playlist/googlevideo.lua deleted file mode 100644 index dbb702c..0000000 --- a/share/lua/playlist/googlevideo.lua +++ /dev/null @@ -1,75 +0,0 @@ ---[[ - $Id$ - - Copyright © 2007 the VideoLAN team - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. ---]] - -function get_url_param( url, name ) - local _,_,ret = string.find( url, "[&?]"..name.."=([^&]*)" ) - return ret -end - --- Probe function. -function probe() - return vlc.access == "http" - and string.match( vlc.path, "video.google.com" ) - and ( string.match( vlc.path, "videoplay" ) - or string.match( vlc.path, "videofeed" ) ) -end - -function get_arg( line, arg ) - return string.gsub( line, "^.*"..arg.."=\"(.-)\".*$", "%1" ) -end - --- Parse function. -function parse() - local docid = get_url_param( vlc.path, "docid" ) - if string.match( vlc.path, "videoplay" ) then - return { { path = "http://video.google.com/videofeed?docid=" .. docid } } - elseif string.match( vlc.path, "videofeed" ) then - local path = nil - local arturl - local duration - local name - local description - while true - do - local line = vlc.readline() - if not line then break end - if string.match( line, "media:content.*flv" ) - then - local _,_,s = string.find( line, "<media:content(.-)/>" ) - path = vlc.strings.resolve_xml_special_chars(get_arg( s, "url" )) - duration = get_arg( s, "duration" ) - end - if string.match( line, "media:thumbnail" ) - then - local _,_,s = string.find( line, "<media:thumbnail(.-)/>" ) - arturl = vlc.strings.resolve_xml_special_chars(get_arg( s, "url" )) - end - if string.match( line, "media:title" ) - then - _,_,name = string.find( line, "<media:title>(.-)</media:title>" ) - end - if string.match( line, "media:description" ) - then - _,_,description = string.find( line, "<media:description>(.-)</media:description>" ) - end - end - return { { path = path; name = name; arturl = arturl; duration = duration; description = description } } - end -end _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits