X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;ds=sidebyside;f=youtube_dl%2Fextractor%2Fdcn.py;h=15a1c40f7a07c36136a0142148af3f7f44f49733;hb=3fc088f8c7f61026943a62fc28e051a7d3a6bdd5;hp=0d140f12fd8ea81d1c486f470bd4f83a2edf82d9;hpb=974c1b2d4292308a26a47136e7fcf9b61f8b285a;p=youtube-dl diff --git a/youtube_dl/extractor/dcn.py b/youtube_dl/extractor/dcn.py index 0d140f12f..15a1c40f7 100644 --- a/youtube_dl/extractor/dcn.py +++ b/youtube_dl/extractor/dcn.py @@ -5,7 +5,10 @@ import re import base64 from .common import InfoExtractor -from ..compat import compat_urllib_parse +from ..compat import ( + compat_urllib_parse, + compat_str, +) from ..utils import ( int_or_none, parse_iso8601, @@ -56,10 +59,8 @@ class DCNBaseIE(InfoExtractor): m3u8_url = self._html_search_regex( r'file\s*:\s*"([^"]+)', webpage, 'm3u8 url', fatal=False) if m3u8_url: - m3u8_formats = self._extract_m3u8_formats( - m3u8_url, video_id, 'mp4', entry_protocol, m3u8_id='hls', fatal=None) - if m3u8_formats: - formats.extend(m3u8_formats) + formats.extend(self._extract_m3u8_formats( + m3u8_url, video_id, 'mp4', entry_protocol, m3u8_id='hls', fatal=None)) rtsp_url = self._search_regex( r']+href="(rtsp://[^"]+)"', webpage, 'rtsp url', fatal=False) @@ -188,7 +189,8 @@ class DCNSeasonIE(InfoExtractor): entries = [] for video in show['videos']: + video_id = compat_str(video['id']) entries.append(self.url_result( - 'http://www.dcndigital.ae/media/%s' % video['id'], 'DCNVideo')) + 'http://www.dcndigital.ae/media/%s' % video_id, 'DCNVideo', video_id)) return self.playlist_result(entries, season_id, title)