Skip to content

V
vlc-2-2
Commit d739fe06 authored by Pierre Ynard's avatar Pierre Ynard
Browse files
Options

metachannels: properly resolve xml entities

parent 9dd9ba63
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
share/lua/sd/metachannels.lua
View file @ d739fe06
...@@ -37,11 +37,11 @@ function search( string ) ...@@ -37,11 +37,11 @@ function search( string )
for _,item in ipairs( channel.children ) do for _,item in ipairs( channel.children ) do
if( item.name == 'item' ) then if( item.name == 'item' ) then
simplexml.add_name_maps( item ) simplexml.add_name_maps( item )
local url = string.gsub( item.children_map['link'][1].children[1], '&', '&' ) local url = vlc.strings.resolve_xml_special_chars( item.children_map['link'][1].children[1] )
local title = item.children_map['title'][1].children[1] local title = vlc.strings.resolve_xml_special_chars( item.children_map['title'][1].children[1] )
local arturl = nil local arturl = nil
if item.children_map['media:thumbnail'] ~= nil then if item.children_map['media:thumbnail'] ~= nil then
arturl = item.children_map['media:thumbnail'][1].attributes['url'] arturl = vlc.strings.resolve_xml_special_chars( item.children_map['media:thumbnail'][1].attributes['url'] )
if( arturl == '/images/thumb_channel_default.jpg' ) then if( arturl == '/images/thumb_channel_default.jpg' ) then
arturl = 'http://www.metachannels.com/images/thumb_channel_default.jpg' arturl = 'http://www.metachannels.com/images/thumb_channel_default.jpg'
end end
...@@ -60,11 +60,11 @@ function main() ...@@ -60,11 +60,11 @@ function main()
for _,item in ipairs( channel.children ) do for _,item in ipairs( channel.children ) do
if( item.name == 'item' ) then if( item.name == 'item' ) then
simplexml.add_name_maps( item ) simplexml.add_name_maps( item )
local url = string.gsub( item.children_map['link'][1].children[1], '&', '&' ) local url = vlc.strings.resolve_xml_special_chars( item.children_map['link'][1].children[1] )
local title = item.children_map['title'][1].children[1] local title = vlc.strings.resolve_xml_special_chars( item.children_map['title'][1].children[1] )
local arturl = nil local arturl = nil
if item.children_map['image'] ~= nil then if item.children_map['image'] ~= nil then
arturl = item.children_map['image'][1].children_map['url'][1].children[1] arturl = vlc.strings.resolve_xml_special_chars( item.children_map['image'][1].children_map['url'][1].children[1] )
end end
local node = vlc.sd.add_item( { path = url, local node = vlc.sd.add_item( { path = url,
title = title, title = title,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment