diff options
| author | Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com> | 2014-04-02 14:13:08 +0200 |
|---|---|---|
| committer | Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com> | 2014-04-02 14:13:08 +0200 |
| commit | f6177462dbba73f80df52a72c666ca769bea173f (patch) | |
| tree | 3ab906ff53b0f69680257391f14b9fcc1ff5c068 | |
| parent | 9ddaf4ef8cce43ad1ae9d3fdbedab2e63f40ca10 (diff) | |
| download | youtube-dl-f6177462dbba73f80df52a72c666ca769bea173f.tar.gz youtube-dl-f6177462dbba73f80df52a72c666ca769bea173f.tar.xz youtube-dl-f6177462dbba73f80df52a72c666ca769bea173f.zip | |
[youtube] feeds: Also look for the html in the 'content_html' field (fixes #2671)
| -rw-r--r-- | youtube_dl/extractor/youtube.py | 5 |
1 files changed, 2 insertions, 3 deletions
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( |