paradizelost/youtube-dl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Prevent youtube IE from taking youtube playlists

Browse Source
This commit is contained in:
Philipp Hagemeister 2011-09-16 22:31:31 +02:00
parent 2d8acd8039
commit 1cde6f1d52
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
youtube-dl
View File

@ -1082,7 +1082,7 @@ class InfoExtractor(object):
class YoutubeIE(InfoExtractor): class YoutubeIE(InfoExtractor):
"""Information extractor for youtube.com.""" """Information extractor for youtube.com."""
_VALID_URL = r'^((?:https?://)?(?:youtu\.be/|(?:\w+\.)?youtube(?:-nocookie)?\.com/)(?:(?:(?:v|embed|e)/)|(?:(?:watch(?:_popup)?(?:\.php)?)?(?:\?|#!?)(?:.+&)?v=))?)?([0-9A-Za-z_-]+)(?(1).+)?$' _VALID_URL = r'^((?:https?://)?(?:youtu\.be/|(?:\w+\.)?youtube(?:-nocookie)?\.com/)(?!view_play_list|my_playlists|artist|playlist)(?:(?:(?:v|embed|e)/)|(?:(?:watch(?:_popup)?(?:\.php)?)?(?:\?|#!?)(?:.+&)?v=))?)?([0-9A-Za-z_-]+)(?(1).+)?$'
_LANG_URL = r'http://www.youtube.com/?hl=en&persist_hl=1&gl=US&persist_gl=1&opt_out_ackd=1' _LANG_URL = r'http://www.youtube.com/?hl=en&persist_hl=1&gl=US&persist_gl=1&opt_out_ackd=1'
_LOGIN_URL = 'https://www.youtube.com/signup?next=/&gl=US&hl=en' _LOGIN_URL = 'https://www.youtube.com/signup?next=/&gl=US&hl=en'
_AGE_URL = 'http://www.youtube.com/verify_age?next_url=/&gl=US&hl=en' _AGE_URL = 'http://www.youtube.com/verify_age?next_url=/&gl=US&hl=en'
@ -3626,12 +3626,12 @@ def gen_extractors():
google_ie = GoogleIE() google_ie = GoogleIE()
yahoo_ie = YahooIE() yahoo_ie = YahooIE()
return [ return [
youtube_ie,
MetacafeIE(youtube_ie),
DailymotionIE(),
YoutubePlaylistIE(youtube_ie), YoutubePlaylistIE(youtube_ie),
YoutubeUserIE(youtube_ie), YoutubeUserIE(youtube_ie),
YoutubeSearchIE(youtube_ie), YoutubeSearchIE(youtube_ie),
youtube_ie,
MetacafeIE(youtube_ie),
DailymotionIE(),
google_ie, google_ie,
GoogleSearchIE(google_ie), GoogleSearchIE(google_ie),
PhotobucketIE(), PhotobucketIE(),