1
0
mirror of https://github.com/spaam/svtplay-dl.git synced 2024-11-24 12:15:40 +01:00

picsearch: They have two ways to write mediaId and media-id.

this fixes #94
This commit is contained in:
Johan Andersson 2014-05-01 21:10:14 +02:00
parent 8290cefc80
commit d2068050b4

View File

@ -19,10 +19,12 @@ class Picsearch(Service, OpenGraphThumbMixin):
if not ajax_auth: if not ajax_auth:
log.error("Cant find token for video") log.error("Cant find token for video")
sys.exit(2) sys.exit(2)
mediaid = re.search(r"mediaId = '(\w+)';", data) mediaid = re.search(r"mediaId = '([^']+)';", data)
if not mediaid: if not mediaid:
log.error("Cant find media id") mediaid = re.search(r'media-id="([^"]+)"', data)
sys.exit(2) if not mediaid:
log.error("Cant find media id")
sys.exit(2)
jsondata = get_http_data("http://csp.picsearch.com/rest?jsonp=&eventParam=1&auth=%s&method=embed&mediaid=%s" % (ajax_auth.group(1), mediaid.group(1))) jsondata = get_http_data("http://csp.picsearch.com/rest?jsonp=&eventParam=1&auth=%s&method=embed&mediaid=%s" % (ajax_auth.group(1), mediaid.group(1)))
jsondata = json.loads(jsondata) jsondata = json.loads(jsondata)
files = jsondata["media"]["playerconfig"]["playlist"][1]["bitrates"] files = jsondata["media"]["playerconfig"]["playlist"][1]["bitrates"]