Commit 7813a370 authored by Ilkka Ollakka's avatar Ilkka Ollakka

katsomo.lua: add code to handle both treeId and progId in url

parent f513e2cc
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
function probe() function probe()
return vlc.access == "http" return vlc.access == "http"
and string.match( vlc.path, "www.katsomo.fi" ) and string.match( vlc.path, "www.katsomo.fi" )
and ( string.match( vlc.path, "treeId" ) or string.match( vlc.path, "progId" ) )
end end
function find( haystack, needle ) function find( haystack, needle )
...@@ -34,6 +35,13 @@ end ...@@ -34,6 +35,13 @@ end
-- Parse function. -- Parse function.
function parse() function parse()
p = {} p = {}
if string.match( vlc.path, "progId" )
then
programid = string.match( vlc.path, "progId=(%d+)")
path = "http://www.katsomo.fi/metafile.asx?p="..programid.."&bw=800"
table.insert(p, { path = path; } )
return p
end
while true while true
do do
line = vlc.readline() line = vlc.readline()
...@@ -42,11 +50,8 @@ function parse() ...@@ -42,11 +50,8 @@ function parse()
then then
title = vlc.strings.decode_uri( find( line, "<title>(.-)<" ) ) title = vlc.strings.decode_uri( find( line, "<title>(.-)<" ) )
end end
if string.match( line, "<li class=\"program\"" ) for programid in string.gmatch( line, "<li class=\"program\" id=\"program(%d+)\"" ) do
then description = vlc.strings.resolve_xml_special_chars( find( line, "title=\"(.+)\"" ) )
description = vlc.strings.resolve_xml_special_chars( find( line, "title=\"(.-)\"" ) )
end
for programid in string.gmatch( line, "<li class=\"program\" id=\"program(.-)\"" ) do
path = "http://www.katsomo.fi/metafile.asx?p="..programid.."&bw=800" path = "http://www.katsomo.fi/metafile.asx?p="..programid.."&bw=800"
table.insert( p, { path = path; name = title; description = description; url = vlc.path;} ) table.insert( p, { path = path; name = title; description = description; url = vlc.path;} )
end end
......
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