vlc/vlc-2.2 | branch: master | Marvin Scholz <[email protected]> | Tue Jul 19 00:21:46 2016 +0200| [76b637f9dc3389a835e29da2bf18653cc436d0a8] | committer: Jean-Baptiste Kempf
lua: Do not compile broken metachannels script The current metachannels script is broken, as the API it uses was deprecated and it's not trivial to migrate to the new API, which uses OAuth. This removes it from the makefile so it's not compiled and not included in VLC, as a broken script is not useful for the user. Signed-off-by: Jean-Baptiste Kempf <[email protected]> (cherry picked from commit 2bfd9e803684b8d2ff3b1b4b961dd7094f746b35) Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=76b637f9dc3389a835e29da2bf18653cc436d0a8 --- share/Makefile.am | 1 - share/lua/sd/metachannels.lua | 75 ----------------------------------------- 2 files changed, 76 deletions(-) diff --git a/share/Makefile.am b/share/Makefile.am index 029c9f4..a1c281a 100644 --- a/share/Makefile.am +++ b/share/Makefile.am @@ -152,7 +152,6 @@ nobase_vlclib_DATA = \ lua/sd/icecast.luac \ lua/sd/icast.luac \ lua/sd/jamendo.luac \ - lua/sd/metachannels.luac \ $(NULL) nobase_doc_DATA = \ diff --git a/share/lua/sd/metachannels.lua b/share/lua/sd/metachannels.lua deleted file mode 100644 index da593c4..0000000 --- a/share/lua/sd/metachannels.lua +++ /dev/null @@ -1,75 +0,0 @@ ---[[ - $Id$ - - Copyright © 2010 VideoLAN and AUTHORS - - Authors: Rémi Duraffort <ivoire at videolan dot org> - - 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. ---]] - -require "simplexml" - -function descriptor() - return { title="Channels.com" } -end - -function search( string ) - -- Do the query - query = string.gsub( string, ' ', '+' ) - local feed = simplexml.parse_url( "http://www.metachannels.com/api/search?apikey=54868d5d73af69d6afa12d55db6f3d18735baa7d&searchTerms="; .. query ) - local channel = feed.children[1] - - -- List all answers - local node = vlc.sd.add_node( { path = "", title = string } ) - for _,item in ipairs( channel.children ) do - if( item.name == 'item' ) then - simplexml.add_name_maps( item ) - local url = vlc.strings.resolve_xml_special_chars( item.children_map['link'][1].children[1] ) - local title = vlc.strings.resolve_xml_special_chars( item.children_map['title'][1].children[1] ) - local arturl = nil - if item.children_map['media:thumbnail'] ~= nil then - arturl = vlc.strings.resolve_xml_special_chars( item.children_map['media:thumbnail'][1].attributes['url'] ) - if( arturl == '/images/thumb_channel_default.jpg' ) then - arturl = 'http://www.metachannels.com/images/thumb_channel_default.jpg' - end - end - node:add_subitem( { path = url, title = title, arturl = arturl } ) - end - end -end - -function main() - -- get the primary feed and parse the <channel> tag - local feed = simplexml.parse_url( "http://metachannels.com/meta_channels?device=vlc&lang=en,es,fr,de,it,other&format=rss&adult_ok=y"; ) - local channel = feed.children[1] - - -- list all children that are items - for _,item in ipairs( channel.children ) do - if( item.name == 'item' ) then - simplexml.add_name_maps( item ) - local url = vlc.strings.resolve_xml_special_chars( item.children_map['link'][1].children[1] ) - local title = vlc.strings.resolve_xml_special_chars( item.children_map['title'][1].children[1] ) - local arturl = nil - if item.children_map['image'] ~= nil then - arturl = vlc.strings.resolve_xml_special_chars( item.children_map['image'][1].children_map['url'][1].children[1] ) - end - local node = vlc.sd.add_item( { path = url, - title = title, - arturl = arturl } ) - end - end -end - _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
