projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Restore INTERNAL version number
[youtube-dl]
/
youtube-dl
diff --git
a/youtube-dl
b/youtube-dl
index 99d07eeec0e576e245ed2a9f99f877b33757f733..becf1d25de31ccbdbaaef76b517bb23490a9c001 100755
(executable)
--- a/
youtube-dl
+++ b/
youtube-dl
@@
-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'
_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',
_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=.+?"'
_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
_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
self._youtube_ie.extract('http://www.youtube.com/watch?v=%s' % id)
return
- if
self._MORE_PAGES_INDICATOR not in pag
e:
+ if
re.search(self._MORE_PAGES_INDICATOR, page) is Non
e:
for id in video_ids:
self._youtube_ie.extract('http://www.youtube.com/watch?v=%s' % id)
return
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."""
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'
_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...',
# Parse command line
parser = optparse.OptionParser(
usage='Usage: %prog [options] url...',
- version='
2009.08.08
',
+ version='
INTERNAL
',
conflict_handler='resolve',
)
conflict_handler='resolve',
)