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 hls “master” playlist.

Browse Source 
this fixes #135
This commit is contained in:
Johan Andersson 2014-09-27 22:34:37 +02:00
parent 619435eff1
commit fdd09734db
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,7 +9,7 @@ import copy
from svtplay_dl.service import Service from svtplay_dl.service import Service
from svtplay_dl.utils import get_http_data from svtplay_dl.utils import get_http_data
from svtplay_dl.log import log from svtplay_dl.log import log
from svtplay_dl.fetcher.hls import HLS from svtplay_dl.fetcher.hls import HLS, hlsparse
class Aftonbladet(Service): class Aftonbladet(Service):
supported_domains = ['tv.aftonbladet.se'] supported_domains = ['tv.aftonbladet.se']
@ -36,16 +36,28 @@ class Aftonbladet(Service):
streamsurl = "http://aftonbladet-play-static-ext.cdn.drvideo.aptoma.no/actions/video/?id=%s&formats&callback=" % videoId streamsurl = "http://aftonbladet-play-static-ext.cdn.drvideo.aptoma.no/actions/video/?id=%s&formats&callback=" % videoId
streams = json.loads(get_http_data(streamsurl)) streams = json.loads(get_http_data(streamsurl))
hlsstreams = streams["formats"]["hls"] hlsstreams = streams["formats"]["hls"]
playlist = False
if "level3" in hlsstreams.keys(): if "level3" in hlsstreams.keys():
hls = hlsstreams["level3"]["csmil"][0] hls = hlsstreams["level3"]
else: else:
hls = hlsstreams["akamai"]["m3u8"][0] hls = hlsstreams["akamai"]
if "csmil" in hls.keys():
hls = hls["csmil"][0]
else:
hls = hls["m3u8"][0]
playlist = True
address = hls["address"] address = hls["address"]
path = hls["path"] path = hls["path"]
for i in hls["files"]: for i in hls["files"]:
if "filename" in i.keys(): if "filename" in i.keys():
playlist = "http://%s/%s/%s/master.m3u8" % (address, path, i["filename"]) plist = "http://%s/%s/%s/master.m3u8" % (address, path, i["filename"])
else: else:
playlist = "http://%s/%s/%s/master.m3u8" % (address, path, hls["filename"]) plist = "http://%s/%s/%s" % (address, path, hls["filename"])
yield HLS(copy.copy(options), playlist, i["bitrate"]) if playlist:
streams = hlsparse(plist)
print streams
for n in list(streams.keys()):
yield HLS(copy.copy(options), streams[n], n)
else:
yield HLS(copy.copy(options), plist, i["bitrate"])