X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fadultswim.py;h=88c96a95060738833f1cc7c85a251f1a26f4962e;hb=2d4fe594c64249c263d739c8094b445c67fa09f5;hp=9c37ea33cd92c15d98841cea49887d76c763110a;hpb=3b859145c2ad4efd5250fc0199174f1ec2068b34;p=youtube-dl diff --git a/youtube_dl/extractor/adultswim.py b/youtube_dl/extractor/adultswim.py index 9c37ea33c..88c96a950 100644 --- a/youtube_dl/extractor/adultswim.py +++ b/youtube_dl/extractor/adultswim.py @@ -7,6 +7,7 @@ from .turner import TurnerBaseIE from ..utils import ( int_or_none, strip_or_none, + url_or_none, ) @@ -98,7 +99,7 @@ class AdultSwimIE(TurnerBaseIE): if not video_id: entries = [] for episode in video_data.get('archiveEpisodes', []): - episode_url = episode.get('url') + episode_url = url_or_none(episode.get('url')) if not episode_url: continue entries.append(self.url_result( @@ -126,7 +127,7 @@ class AdultSwimIE(TurnerBaseIE): video_id = video_data['id'] info = self._extract_cvp_info( - 'http://www.adultswim.com/videos/api/v0/assets?id=' + video_id, + 'http://www.adultswim.com/videos/api/v0/assets?platform=desktop&id=' + video_id, video_id, { 'secure': { 'media_src': 'http://androidhls-secure.cdn.turner.com/adultswim/big',