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

expressen: fixed an issue we cant find the id

Browse Source 
fixes: #1003
This commit is contained in:
Johan Andersson 2018-11-18 12:26:05 +01:00
parent 1c302d4a18
commit a665f98836
1 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/svtplay_dl/service/expressen.py
View File

@ -5,7 +5,7 @@ import re
import json import json
from svtplay_dl.service import Service from svtplay_dl.service import Service
from svtplay_dl.log import log from svtplay_dl.error import ServiceError
from svtplay_dl.fetcher.hls import hlsparse from svtplay_dl.fetcher.hls import hlsparse
from svtplay_dl.utils.text import decode_html_entities from svtplay_dl.utils.text import decode_html_entities
@ -16,26 +16,14 @@ class Expressen(Service):
def get(self): def get(self):
data = self.get_urldata() data = self.get_urldata()
match = re.search('="(https://www.expressen.se/tvspelare[^"]+)"', data) match = re.search('data-article-data="([^"]+)"', data)
if not match: if not match:
log.error("Can't find video id") yield ServiceError("Cant find video file info")
return return
url = decode_html_entities(match.group(1)) data = decode_html_entities(match.group(1))
data = self.http.request("get", url) janson = json.loads(data)
self.config.set("live", janson["isLive"])
match = re.search("window.Player.settings = ({.*});", data.text) streams = hlsparse(self.config, self.http.request("get", janson["stream"]), janson["stream"], output=self.output)
if not match:
log.error("Can't find json info.")
dataj = json.loads(match.group(1))
if "streams" in dataj:
if "iPad" in dataj["streams"]:
streams = hlsparse(self.config, self.http.request("get", dataj["streams"]["iPad"]),
dataj["streams"]["iPad"], output=self.output)
for n in list(streams.keys()):
yield streams[n]
if "hashHls" in dataj["streams"]:
streams = hlsparse(self.config, self.http.request("get", dataj["streams"]["hashHls"]),
dataj["streams"]["hashHls"], output=self.output)
for n in list(streams.keys()): for n in list(streams.keys()):
yield streams[n] yield streams[n]