Bump version number

Modify _MORE_PAGES_INDICATOR for searches (fixes issue #41 )
Accept my_playlists syntax for playlists
2010-10-31 11:24:48 +01:00 · 2010-10-31 11:24:48 +01:00 · 2010-10-31 11:24:48 +01:00 · 2010-10-31 11:24:48 +01:00 · 2010-10-31 11:24:48 +01:00
2 changed files with 6 additions and 6 deletions
--- a/2
+++ b/2
@@ -1 +1 @@
-2009.08.08
+2009.09.08
--- a/10
+++ b/10
@@ -512,7 +512,7 @@ class YoutubeIE(InfoExtractor):
 	_LOGIN_URL = 'http://www.youtube.com/signup?next=/&gl=US&hl=en'
 	_AGE_URL = 'http://www.youtube.com/verify_age?next_url=/&gl=US&hl=en'
 	_NETRC_MACHINE = 'youtube'
-	_available_formats = ['22', '35', '18', '5', '17', '13'] # listed in order of priority for -b flag
+	_available_formats = ['22', '35', '18', '5', '17', '13', None] # listed in order of priority for -b flag
 	_video_extensions = {
 		'13': '3gp',
 		'17': 'mp4',
@@ -879,7 +879,7 @@ class YoutubeSearchIE(InfoExtractor):
 	_VALID_QUERY = r'ytsearch(\d+|all)?:[\s\S]+'
 	_TEMPLATE_URL = 'http://www.youtube.com/results?search_query=%s&page=%s&gl=US&hl=en'
 	_VIDEO_INDICATOR = r'href="/watch\?v=.+?"'
-	_MORE_PAGES_INDICATOR = r'>Next</a>'
+	_MORE_PAGES_INDICATOR = r'(?m)>\s*Next\s*</a>'
 	_youtube_ie = None
 	_max_youtube_results = 1000

@@ -956,7 +956,7 @@ class YoutubeSearchIE(InfoExtractor):
 							self._youtube_ie.extract('http://www.youtube.com/watch?v=%s' % id)
 						return

-			if self._MORE_PAGES_INDICATOR not in page:
+			if re.search(self._MORE_PAGES_INDICATOR, page) is None:
 				for id in video_ids:
 					self._youtube_ie.extract('http://www.youtube.com/watch?v=%s' % id)
 				return
@@ -966,7 +966,7 @@ class YoutubeSearchIE(InfoExtractor):
 class YoutubePlaylistIE(InfoExtractor):
 	"""Information Extractor for YouTube playlists."""

-	_VALID_URL = r'(?:http://)?(?:\w+\.)?youtube.com/view_play_list\?p=(.+)'
+	_VALID_URL = r'(?:http://)?(?:\w+\.)?youtube.com/(?:view_play_list|my_playlists)\?.*?p=([^&]+).*'
 	_TEMPLATE_URL = 'http://www.youtube.com/view_play_list?p=%s&page=%s&gl=US&hl=en'
 	_VIDEO_INDICATOR = r'/watch\?v=(.+?)&'
 	_MORE_PAGES_INDICATOR = r'/view_play_list?p=%s&page=%s'
@@ -1084,7 +1084,7 @@ if __name__ == '__main__':
 		# Parse command line
 		parser = optparse.OptionParser(
 			usage='Usage: %prog [options] url...',
-			version='2009.08.08',
+			version='2009.09.08',
 			conflict_handler='resolve',
 		)
Author	SHA1	Message	Date
Ricardo Garcia	dd24ff44ab	Bump version number	2010-10-31 11:24:48 +01:00
Ricardo Garcia	304a4d85ea	Modify _MORE_PAGES_INDICATOR for searches (fixes issue #41 )	2010-10-31 11:24:48 +01:00
Ricardo Garcia	d899774377	Accept my_playlists syntax for playlists	2010-10-31 11:24:48 +01:00
Ricardo Garcia	fade05990c	Do not specify any format as a last option for the -b flag	2010-10-31 11:24:48 +01:00
Ricardo Garcia	e5b1604882	Set INTERNAL version number	2010-10-31 11:24:48 +01:00
@@ -1 +1 @@
 .08.08
 .09.08