Mirror
/
youtube-dl
mirror of https://github.com/ytdl-org/youtube-dl.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[adultswim] raise ExtractorError if no clips in video_info

pull/7117/merge
remitamine 2015-10-10 17:57:05 +01:00 committed by Sergey M․
parent 58cd7e173e
commit 00cde0b8dc
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
youtube_dl/extractor/adultswim.py
View File

@ -85,9 +85,6 @@ class AdultSwimIE(InfoExtractor):
def find_video_info(collection, slug): def find_video_info(collection, slug):
for video in collection.get('videos'): for video in collection.get('videos'):
if video.get('slug') == slug: 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 @staticmethod
@ -101,9 +98,6 @@ class AdultSwimIE(InfoExtractor):
for collection in collections: for collection in collections:
for video in collection.get('videos'): for video in collection.get('videos'):
if video.get('slug') == slug: 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 return None, None
@ -135,15 +129,18 @@ class AdultSwimIE(InfoExtractor):
if video_info is None: if video_info is None:
if bootstrapped_data.get('slugged_video', {}).get('slug') == episode_path: if bootstrapped_data.get('slugged_video', {}).get('slug') == episode_path:
video_info = bootstrapped_data['slugged_video'] video_info = bootstrapped_data['slugged_video']
if video_info.get('auth'):
raise ExtractorError('This video is only available for registered users', expected=True)
else: else:
raise ExtractorError('Unable to find video info') raise ExtractorError('Unable to find video info')
show = bootstrapped_data['show'] show = bootstrapped_data['show']
show_title = show['title'] show_title = show['title']
stream = video_info.get('stream') 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] segment_ids = [clip['videoPlaybackID'] for clip in clips]
episode_id = video_info['id'] episode_id = video_info['id']