diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2014-09-13 07:14:19 +0200 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2014-09-13 07:14:19 +0200 |
| commit | 9b583dca4cf3b623323de8fadf6dc851b7111fd2 (patch) | |
| tree | b67ad9d6cec028ee770a49aa45c4c7f8a7697966 /youtube_dl/extractor | |
| parent | f4a3490cbc8a6cae0a10b4ca68c2a40a41dddf83 (diff) | |
| parent | 1a9b9649fbad88ef9f264d2f0e1804ba70c11469 (diff) | |
Merge remote-tracking branch 'drags/yt-feed-loadmore'
Diffstat (limited to 'youtube_dl/extractor')
| -rw-r--r-- | youtube_dl/extractor/youtube.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/youtube_dl/extractor/youtube.py b/youtube_dl/extractor/youtube.py index c77f09aac..e28db2b5a 100644 --- a/youtube_dl/extractor/youtube.py +++ b/youtube_dl/extractor/youtube.py @@ -1397,6 +1397,7 @@ class YoutubeFeedsInfoExtractor(YoutubeBaseInfoExtractor): u'%s feed' % self._FEED_NAME, u'Downloading page %s' % i) feed_html = info.get('feed_html') or info.get('content_html') + load_more_widget_html = info.get('load_more_widget_html') or feed_html m_ids = re.finditer(r'"/watch\?v=(.*?)["&]', feed_html) ids = orderedSet(m.group(1) for m in m_ids) feed_entries.extend( @@ -1404,7 +1405,7 @@ class YoutubeFeedsInfoExtractor(YoutubeBaseInfoExtractor): for video_id in ids) mobj = re.search( r'data-uix-load-more-href="/?[^"]+paging=(?P<paging>\d+)', - feed_html) + load_more_widget_html) if mobj is None: break paging = mobj.group('paging') |