mirror of
https://github.com/yt-dlp/yt-dlp.git
synced 2024-09-05 05:55:24 +02:00
Modify _MORE_PAGES_INDICATOR for searches (fixes issue #41)
This commit is contained in:
parent
d899774377
commit
304a4d85ea
@ -879,7 +879,7 @@ class YoutubeSearchIE(InfoExtractor):
|
|||||||
_VALID_QUERY = r'ytsearch(\d+|all)?:[\s\S]+'
|
_VALID_QUERY = r'ytsearch(\d+|all)?:[\s\S]+'
|
||||||
_TEMPLATE_URL = 'http://www.youtube.com/results?search_query=%s&page=%s&gl=US&hl=en'
|
_TEMPLATE_URL = 'http://www.youtube.com/results?search_query=%s&page=%s&gl=US&hl=en'
|
||||||
_VIDEO_INDICATOR = r'href="/watch\?v=.+?"'
|
_VIDEO_INDICATOR = r'href="/watch\?v=.+?"'
|
||||||
_MORE_PAGES_INDICATOR = r'>Next</a>'
|
_MORE_PAGES_INDICATOR = r'(?m)>\s*Next\s*</a>'
|
||||||
_youtube_ie = None
|
_youtube_ie = None
|
||||||
_max_youtube_results = 1000
|
_max_youtube_results = 1000
|
||||||
|
|
||||||
@ -956,7 +956,7 @@ class YoutubeSearchIE(InfoExtractor):
|
|||||||
self._youtube_ie.extract('http://www.youtube.com/watch?v=%s' % id)
|
self._youtube_ie.extract('http://www.youtube.com/watch?v=%s' % id)
|
||||||
return
|
return
|
||||||
|
|
||||||
if self._MORE_PAGES_INDICATOR not in page:
|
if re.search(self._MORE_PAGES_INDICATOR, page) is None:
|
||||||
for id in video_ids:
|
for id in video_ids:
|
||||||
self._youtube_ie.extract('http://www.youtube.com/watch?v=%s' % id)
|
self._youtube_ie.extract('http://www.youtube.com/watch?v=%s' % id)
|
||||||
return
|
return
|
||||||
|
Loading…
Reference in New Issue
Block a user