1
0
mirror of https://github.com/spaam/svtplay-dl.git synced 2024-11-27 21:54:17 +01:00

expressen: it works now again.

This commit is contained in:
Johan Andersson 2013-02-21 19:09:33 +01:00
parent 623b54c057
commit 66bb33243a

View File

@ -911,13 +911,12 @@ class Expressen():
return "expressen.se" in url return "expressen.se" in url
def get(self, options, url): def get(self, options, url):
parse = urlparse(url) data = get_http_data(url)
match = re.search("/(.*[\/\+].*)/", unquote_plus(parse.path)) match = re.search("xmlUrl: '(http://www.expressen.*)'", data)
if not match: if not match:
log.error("Can't find video file") log.error("Can't find video file")
sys.exit(2) sys.exit(2)
url = "http://tv.expressen.se/%s/?standAlone=true&output=xml" % quote_plus(match.group(1)) url = match.group(1)
other = ""
data = get_http_data(url) data = get_http_data(url)
xml = ET.XML(data) xml = ET.XML(data)
ss = xml.find("vurls") ss = xml.find("vurls")
@ -933,7 +932,7 @@ class Expressen():
test = select_quality(options, streams) test = select_quality(options, streams)
filename = test filename = test
match = re.search("rtmp://([0-9a-z\.]+/[0-9]+/)(.*).flv", filename) match = re.search("rtmp://([0-9a-z\.]+/[0-9]+/)(.*)", filename)
filename = "rtmp://%s" % match.group(1) filename = "rtmp://%s" % match.group(1)
options.other = "-y %s" % match.group(2) options.other = "-y %s" % match.group(2)