w/youtube-dl
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

[prosiebensat1] Make downloading urls JSON non fatal

Browse source
This commit is contained in:
Sergey M․ 2016-07-06 00:52:48 +07:00
parent 6c26815d63
commit a6d3b89feb
No known key found for this signature in database
GPG key ID: 2C393E0F18A9236D
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
youtube_dl/extractor/prosiebensat1.py
View file

@ -280,7 +280,7 @@ class ProSiebenSat1IE(InfoExtractor):
client_id = g[:2] + sha1(''.join([g, clip_id, access_token, server_id, client_location, source_id, g, client_name]).encode('utf-8')).hexdigest() client_id = g[:2] + sha1(''.join([g, clip_id, access_token, server_id, client_location, source_id, g, client_name]).encode('utf-8')).hexdigest()
urls = self._download_json( urls = self._download_json(
'http://vas.sim-technik.de/vas/live/v2/videos/%s/sources/url' % clip_id, 'http://vas.sim-technik.de/vas/live/v2/videos/%s/sources/url' % clip_id,
clip_id, 'Downloading urls JSON', query={ clip_id, 'Downloading urls JSON', fatal=False, query={
'access_token': access_token, 'access_token': access_token,
'client_id': client_id, 'client_id': client_id,
'client_location': client_location, 'client_location': client_location,
@ -288,6 +288,8 @@ class ProSiebenSat1IE(InfoExtractor):
'server_id': server_id, 'server_id': server_id,
'source_ids': source_id, 'source_ids': source_id,
}) })
if not urls:
continue
if urls.get('status_code') != 0: if urls.get('status_code') != 0:
raise ExtractorError('This video is unavailable', expected=True) raise ExtractorError('This video is unavailable', expected=True)
urls_sources = urls['sources'] urls_sources = urls['sources']