if autogenerated:
# The videos are contained in a single page
# the ajax pages can't be used, they are empty
- videos = self.extract_videos_from_page(channel_page)
entries = [
self.url_result(
video_id, 'Youtube', video_id=video_id,
video_title=video_title)
- for video_id, video_title in videos]
+ for video_id, video_title in self.extract_videos_from_page(channel_page)]
return self.playlist_result(entries, channel_id)
def _entries():
more_widget_html = content_html = channel_page
for pagenum in itertools.count(1):
- ids_in_page = self.extract_videos_from_page(content_html)
- for video_id, video_title in ids_in_page:
+ for video_id, video_title in self.extract_videos_from_page(content_html):
yield self.url_result(
video_id, 'Youtube', video_id=video_id,
video_title=video_title)
while (PAGE_SIZE * pagenum) < limit:
result_url = self._API_URL % (
compat_urllib_parse.quote_plus(query.encode('utf-8')),
- (PAGE_SIZE * pagenum) + 1)
+ max((PAGE_SIZE * pagenum) + 1), 2)
data_json = self._download_webpage(
result_url, video_id='query "%s"' % query,
note='Downloading page %s' % (pagenum + 1),