[youtube] Fix extraction of the feed 'paging' values (fixes #2925)

This commit is contained in:
Jaime Marquínez Ferrándiz 2014-05-16 15:52:34 +02:00
parent b74feacac5
commit 05ee2b6dad

View file

@ -1775,9 +1775,12 @@ class YoutubeFeedsInfoExtractor(YoutubeBaseInfoExtractor):
feed_entries.extend( feed_entries.extend(
self.url_result(video_id, 'Youtube', video_id=video_id) self.url_result(video_id, 'Youtube', video_id=video_id)
for video_id in ids) for video_id in ids)
if info['paging'] is None: mobj = re.search(
r'data-uix-load-more-href="/?[^"]+paging=(?P<paging>\d+)',
feed_html)
if mobj is None:
break break
paging = info['paging'] paging = mobj.group('paging')
return self.playlist_result(feed_entries, playlist_title=self._PLAYLIST_TITLE) return self.playlist_result(feed_entries, playlist_title=self._PLAYLIST_TITLE)
class YoutubeSubscriptionsIE(YoutubeFeedsInfoExtractor): class YoutubeSubscriptionsIE(YoutubeFeedsInfoExtractor):