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

aftonbladet: support for the new design

Browse Source
This commit is contained in:
Johan Andersson 2015-02-17 13:40:55 -08:00
parent 1e501bc7b9
commit 3821481322
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,7 +6,7 @@ import json
import copy
from svtplay_dl.service import Service
from svtplay_dl.utils import get_http_data
from svtplay_dl.utils import get_http_data, decode_html_entities
from svtplay_dl.log import log
from svtplay_dl.fetcher.hls import HLS, hlsparse
@ -24,15 +24,21 @@ class Aftonbladet(Service):
match = re.search('data-aptomaId="([-0-9a-z]+)"', data)
if not match:
log.error("Can't find video info")
return
videoId = match.group(1)
match = re.search(r'data-isLive="(\w+)"', data)
if not match:
log.error("Can't find live info")
return
if match.group(1) == "true":
options.live = True
match = re.search('data-player-config="([^"]+)"', data)
if not match:
log.error("Can't find video info")
return
janson = json.loads(decode_html_entities(match.group(1)))
videoId = janson["videoId"]
else:
videoId = match.group(1)
match = re.search(r'data-isLive="(\w+)"', data)
if not match:
log.error("Can't find live info")
return
if match.group(1) == "true":
options.live = True
if not options.live:
dataurl = "http://aftonbladet-play-metadata.cdn.drvideo.aptoma.no/video/%s.json" % videoId
error, data = get_http_data(dataurl)