[youtube:feeds] (Fixes #4486)

This commit is contained in:
Philipp Hagemeister 2014-12-16 15:59:31 +01:00
parent bb18d787b5
commit 84d84211ac

View File

@ -1566,9 +1566,11 @@ class YoutubeFeedsInfoExtractor(YoutubeBaseInfoExtractor):
feed_entries = [] feed_entries = []
paging = 0 paging = 0
for i in itertools.count(1): for i in itertools.count(1):
info = self._download_json(self._FEED_TEMPLATE % paging, info = self._download_json(
self._FEED_TEMPLATE % paging,
'%s feed' % self._FEED_NAME, '%s feed' % self._FEED_NAME,
'Downloading page %s' % i) 'Downloading page %s' % i,
transform_source=uppercase_escape)
feed_html = info.get('feed_html') or info.get('content_html') feed_html = info.get('feed_html') or info.get('content_html')
load_more_widget_html = info.get('load_more_widget_html') or feed_html load_more_widget_html = info.get('load_more_widget_html') or feed_html
m_ids = re.finditer(r'"/watch\?v=(.*?)["&]', feed_html) m_ids = re.finditer(r'"/watch\?v=(.*?)["&]', feed_html)