From a5a8877f9c9f017853bf0cb8cf4fa5598f8e771b Mon Sep 17 00:00:00 2001 From: Yen Chi Hsuan Date: Thu, 27 Oct 2016 02:16:48 +0800 Subject: [PATCH] [adultswim] Fix extraction (closes #10979) --- ChangeLog | 1 + youtube_dl/extractor/adultswim.py | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/ChangeLog b/ChangeLog index 1c3b63c86..b4de1d35f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ version Extractors +* [adultswim] Fix extraction (#10979) * [hornbunny] Fix extraction (#10981) diff --git a/youtube_dl/extractor/adultswim.py b/youtube_dl/extractor/adultswim.py index 5d0bf5a68..989505c82 100644 --- a/youtube_dl/extractor/adultswim.py +++ b/youtube_dl/extractor/adultswim.py @@ -96,6 +96,27 @@ class AdultSwimIE(TurnerBaseIE): 'skip_download': True, }, 'expected_warnings': ['Unable to download f4m manifest'], + }, { + 'url': 'http://www.adultswim.com/videos/toonami/friday-october-14th-2016/', + 'info_dict': { + 'id': 'eYiLsKVgQ6qTC6agD67Sig', + 'title': 'Toonami - Friday, October 14th, 2016', + 'description': 'md5:99892c96ffc85e159a428de85c30acde', + }, + 'playlist': [{ + 'md5': '', + 'info_dict': { + 'id': 'eYiLsKVgQ6qTC6agD67Sig', + 'ext': 'mp4', + 'title': 'Toonami - Friday, October 14th, 2016', + 'description': 'md5:99892c96ffc85e159a428de85c30acde', + }, + }], + 'params': { + # m3u8 download + 'skip_download': True, + }, + 'expected_warnings': ['Unable to download f4m manifest'], }] @staticmethod @@ -163,6 +184,8 @@ class AdultSwimIE(TurnerBaseIE): segment_ids = [clip['videoPlaybackID'] for clip in video_info['clips']] elif video_info.get('videoPlaybackID'): segment_ids = [video_info['videoPlaybackID']] + elif video_info.get('id'): + segment_ids = [video_info['id']] else: if video_info.get('auth') is True: raise ExtractorError(