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

svtplay: fixing a regression from last version

Browse Source
This commit is contained in:
Johan Andersson 2013-10-14 20:05:03 +02:00
parent d549f7c374
commit 71b1b585d0
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,7 +7,7 @@ import json
from svtplay_dl.service import Service from svtplay_dl.service import Service
from svtplay_dl.utils import get_http_data, select_quality, subtitle_wsrt from svtplay_dl.utils import get_http_data, select_quality, subtitle_wsrt
from svtplay_dl.utils.urllib import urlparse
from svtplay_dl.fetcher.hds import download_hds from svtplay_dl.fetcher.hds import download_hds
from svtplay_dl.fetcher.hls import download_hls from svtplay_dl.fetcher.hls import download_hls
from svtplay_dl.fetcher.rtmp import download_rtmp from svtplay_dl.fetcher.rtmp import download_rtmp
@ -45,19 +45,20 @@ class Svtplay(Service):
streams = {} streams = {}
streams2 = {} #hack.. streams2 = {} #hack..
for i in data["video"]["videoReferences"]: for i in data["video"]["videoReferences"]:
if options.hls and i["url"][len(i["url"])-4:] == "m3u8": parse = urlparse(i["url"])
if options.hls and parse.path[len(parse.path)-4:] == "m3u8":
stream = {} stream = {}
stream["url"] = i["url"] stream["url"] = i["url"]
streams[int(i["bitrate"])] = stream streams[int(i["bitrate"])] = stream
elif not options.hls and i["url"][len(i["url"])-3:] == "f4m": elif not options.hls and parse.path[len(parse.path)-3:] == "f4m":
stream = {} stream = {}
stream["url"] = i["url"] stream["url"] = i["url"]
streams[int(i["bitrate"])] = stream streams[int(i["bitrate"])] = stream
elif not options.hls and i["url"][len(i["url"])-3:] != "f4m" and i["url"][len(i["url"])-4:] != "m3u8": elif not options.hls and parse.path[len(parse.path)-3:] != "f4m" and i["url"][len(i["url"])-4:] != "m3u8":
stream = {} stream = {}
stream["url"] = i["url"] stream["url"] = i["url"]
streams[int(i["bitrate"])] = stream streams[int(i["bitrate"])] = stream
if options.hls and i["url"][len(i["url"])-3:] == "f4m": if options.hls and parse.path[len(parse.path)-3:] == "f4m":
stream = {} stream = {}
stream["url"] = i["url"] stream["url"] = i["url"]
streams2[int(i["bitrate"])] = stream streams2[int(i["bitrate"])] = stream