Saverr/svtplay-dl
1
0
Fork 0
mirror of https://github.com/spaam/svtplay-dl.git synced 2024-11-28 06:04:17 +01:00
Code Issues Projects Releases Wiki Activity

svtplay: http-rewrite

Browse Source
This commit is contained in:
Johan Andersson 2014-11-26 16:03:34 +01:00
parent 77525f8092
commit be75c47419
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/svtplay_dl/service/svtplay.py
View File

@ -7,7 +7,7 @@ import os
import xml.etree.ElementTree as ET
import copy
from svtplay_dl.service import Service, OpenGraphThumbMixin
from svtplay_dl.utils import get_http_data, filenamify
from svtplay_dl.utils import get_http_data, filenamify, HTTPError
from svtplay_dl.utils.urllib import urlparse
from svtplay_dl.fetcher.hds import hdsparse
from svtplay_dl.fetcher.hls import HLS, hlsparse
@ -25,7 +25,11 @@ class Svtplay(Service, OpenGraphThumbMixin):
def get(self, options):
if re.findall("svt.se", self.url):
match = re.search(r"data-json-href=\"(.*)\"", self.get_urldata())
try:
match = re.search(r"data-json-href=\"(.*)\"", self.get_urldata())
except HTTPError:
log.error("Can't get the page")
return
if match:
filename = match.group(1).replace("&", "&").replace("&format=json", "")
url = "http://www.svt.se%s" % filename
@ -40,7 +44,11 @@ class Svtplay(Service, OpenGraphThumbMixin):
dataurl = "%s?&output=json&format=json" % url
else:
dataurl = "%s&output=json&format=json" % url
data = json.loads(get_http_data(dataurl))
try:
data = json.loads(get_http_data(dataurl))
except HTTPError:
log.error("Can't get api page.")
return
if "live" in data["video"]:
options.live = data["video"]["live"]
else: