diff options
| author | remitamine <remitamine@gmail.com> | 2015-10-10 17:57:05 +0100 |
|---|---|---|
| committer | Sergey M․ <dstftw@gmail.com> | 2015-10-11 01:03:46 +0600 |
| commit | 00cde0b8dc3a534a929b88da086cc540dc212ea4 (patch) | |
| tree | cedc500361034b7ef48ba2e54137a0448a529e4e | |
| parent | 58cd7e173e70ae40a79bb10e08b2c2ea02bc8248 (diff) | |
[adultswim] raise ExtractorError if no clips in video_info
| -rw-r--r-- | youtube_dl/extractor/adultswim.py | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/youtube_dl/extractor/adultswim.py b/youtube_dl/extractor/adultswim.py index 0eb21b16d..35606878d 100644 --- a/youtube_dl/extractor/adultswim.py +++ b/youtube_dl/extractor/adultswim.py @@ -85,10 +85,7 @@ class AdultSwimIE(InfoExtractor): def find_video_info(collection, slug): for video in collection.get('videos'): if video.get('slug') == slug: - if video.get('auth'): - raise ExtractorError('This video is only available for registered users', expected=True) - else: - return video + return video @staticmethod def find_collection_by_linkURL(collections, linkURL): @@ -101,10 +98,7 @@ class AdultSwimIE(InfoExtractor): for collection in collections: for video in collection.get('videos'): if video.get('slug') == slug: - if video.get('auth'): - raise ExtractorError('This video is only available for registered users', expected=True) - else: - return collection, video + return collection, video return None, None def _real_extract(self, url): @@ -135,15 +129,18 @@ class AdultSwimIE(InfoExtractor): if video_info is None: if bootstrapped_data.get('slugged_video', {}).get('slug') == episode_path: video_info = bootstrapped_data['slugged_video'] - if video_info.get('auth'): - raise ExtractorError('This video is only available for registered users', expected=True) else: raise ExtractorError('Unable to find video info') show = bootstrapped_data['show'] show_title = show['title'] stream = video_info.get('stream') - clips = [stream] if stream else video_info['clips'] + clips = [stream] if stream else video_info.get('clips') + if not clips: + if video_info.get('auth'): + raise ExtractorError('This video is only available for registered users', expected=True) + else: + raise ExtractorError('Unable to find clips') segment_ids = [clip['videoPlaybackID'] for clip in clips] episode_id = video_info['id'] |