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

twitch: better error handling

Browse Source
This commit is contained in:
Johan Andersson 2015-09-06 14:37:40 +02:00
parent acf526c54a
commit 8408375356
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/twitch.py
View File

@ -14,6 +14,7 @@ from svtplay_dl.service import Service
from svtplay_dl.utils import filenamify from svtplay_dl.utils import filenamify
from svtplay_dl.log import log from svtplay_dl.log import log
from svtplay_dl.fetcher.hls import HLS, hlsparse from svtplay_dl.fetcher.hls import HLS, hlsparse
from svtplay_dl.error import ServiceError
class TwitchException(Exception): class TwitchException(Exception):
@ -69,7 +70,11 @@ class Twitch(Service):
access = self._get_access_token(videoid) access = self._get_access_token(videoid)
if options.output_auto: if options.output_auto:
info = json.loads(self.http.request("get", "https://api.twitch.tv/kraken/videos/v%s" % videoid).content) data = self.http.request("get", "https://api.twitch.tv/kraken/videos/v%s" % videoid)
if data.status_code == 404:
yield ServiceError("Can't find the video")
return
info = json.loads(data.text)
options.output = "twitch-%s-%s" % (info["channel"]["name"], filenamify(info["title"])) options.output = "twitch-%s-%s" % (info["channel"]["name"], filenamify(info["title"]))
if "token" not in access: if "token" not in access:
@ -147,7 +152,10 @@ class Twitch(Service):
options.live = True options.live = True
if not options.output: if not options.output:
options.output = channel options.output = channel
data = self.http.request("get", hls_url)
streams = hlsparse(self.http.request("get", hls_url).text) if data.status_code == 404:
yield ServiceError("Stream is not online.")
return
streams = hlsparse(hls_url, data.text)
for n in list(streams.keys()): for n in list(streams.keys()):
yield HLS(copy.copy(options), streams[n], n) yield HLS(copy.copy(options), streams[n], n)