Mirrored_Repos/twitch-dl
1
0
Fork 0
mirror of https://github.com/ihabunek/twitch-dl synced 2024-08-30 18:32:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle more gracefully when video/clip not found

Browse Source
This commit is contained in:
Ivan Habunek
2020-08-09 11:55:40 +02:00
parent 78295a492c
commit 4edf299780
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
twitchdl/commands.py
View File

@ -219,6 +219,9 @@ def _download_clip(slug, args):
print_out("<dim>Looking up clip...</dim>") print_out("<dim>Looking up clip...</dim>")
clip = twitch.get_clip(slug) clip = twitch.get_clip(slug)
if not clip:
raise ConsoleError("Clip '{}' not found".format(slug))
print_out("Found: <green>{}</green> by <yellow>{}</yellow>, playing <blue>{}</blue> ({})".format( print_out("Found: <green>{}</green> by <yellow>{}</yellow>, playing <blue>{}</blue> ({})".format(
clip["title"], clip["title"],
clip["broadcaster"]["displayName"], clip["broadcaster"]["displayName"],

4
twitchdl/twitch.py
View File

@ -18,8 +18,10 @@ def authenticated_get(url, params={}, headers={}):
headers['Client-ID'] = CLIENT_ID headers['Client-ID'] = CLIENT_ID
response = requests.get(url, params, headers=headers) response = requests.get(url, params, headers=headers)
if response.status_code == 400: if 400 <= response.status_code < 500:
data = response.json() data = response.json()
# TODO: this does not look nice in the console since data["message"]
# can contain a JSON encoded object.
raise ConsoleError(data["message"]) raise ConsoleError(data["message"])
response.raise_for_status() response.raise_for_status()