R-yan/l1ving_youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove exception voodoo

Browse Source
This commit is contained in:
dzikie drożdże 2016-01-08 09:58:42 +01:00
parent eaef7bdf99
commit a507d7aebd
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
youtube_dl/extractor/tvp.py
View File

@ -35,7 +35,7 @@ class TvpApi:
json = self._get_json(TOKENIZER_URL, id) json = self._get_json(TOKENIZER_URL, id)
status = json['status'] status = json['status']
if status == 'NOT_PLAYABLE': if status == 'NOT_PLAYABLE':
raise ExtractorError("video is not playable") raise ExtractorError("video is not playable", expected=True)
if status != 'OK': if status != 'OK':
raise ExtractorError("unknown status: %s", status) raise ExtractorError("unknown status: %s", status)
return json['formats'] return json['formats']
@ -147,11 +147,7 @@ class TvpIE(InfoExtractor):
url = context['url'] url = context['url']
description = context['description_root'] description = context['description_root']
try: formats = self._format_formats(self.api.formats(id), id)
formats = self._format_formats(self.api.formats(id), id)
except ExtractorError as e:
self.to_screen("%s: %s" % (title, e))
raise
self._sort_formats(formats) self._sort_formats(formats)
@ -174,10 +170,7 @@ class TvpIE(InfoExtractor):
ids.append(item['_id']) ids.append(item['_id'])
if 'video' in item['types'] and item['is_released']: if 'video' in item['types'] and item['is_released']:
meta = self.api.context(item['_id']) meta = self.api.context(item['_id'])
try: yield self._get_video(meta)
yield self._get_video(meta)
except ExtractorError:
pass
def _get_playlist(self, context): def _get_playlist(self, context):
id = context['material_id'] id = context['material_id']