From: Jaime Marquínez Ferrándiz Date: Wed, 2 Apr 2014 12:13:08 +0000 (+0200) Subject: [youtube] feeds: Also look for the html in the 'content_html' field (fixes #2671) X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=f6177462dbba73f80df52a72c666ca769bea173f;p=youtube-dl [youtube] feeds: Also look for the html in the 'content_html' field (fixes #2671) --- diff --git a/youtube_dl/extractor/youtube.py b/youtube_dl/extractor/youtube.py index 856a9a596..b6a1884b5 100644 --- a/youtube_dl/extractor/youtube.py +++ b/youtube_dl/extractor/youtube.py @@ -1738,11 +1738,10 @@ class YoutubeFeedsInfoExtractor(YoutubeBaseInfoExtractor): feed_entries = [] paging = 0 for i in itertools.count(1): - info = self._download_webpage(self._FEED_TEMPLATE % paging, + info = self._download_json(self._FEED_TEMPLATE % paging, u'%s feed' % self._FEED_NAME, u'Downloading page %s' % i) - info = json.loads(info) - feed_html = info['feed_html'] + feed_html = info.get('feed_html') or info.get('content_html') m_ids = re.finditer(r'"/watch\?v=(.*?)["&]', feed_html) ids = orderedSet(m.group(1) for m in m_ids) feed_entries.extend(