projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Improve some _VALID_URLs
[youtube-dl]
/
youtube_dl
/
extractor
/
vevo.py
diff --git
a/youtube_dl/extractor/vevo.py
b/youtube_dl/extractor/vevo.py
index 388b4debee27d7331ae7dc351338e3829e539071..783efda7d337217fe0ed86a97a5dfa0902a5b7bf 100644
(file)
--- a/
youtube_dl/extractor/vevo.py
+++ b/
youtube_dl/extractor/vevo.py
@@
-31,7
+31,7
@@
class VevoIE(VevoBaseIE):
(currently used by MTVIE and MySpaceIE)
'''
_VALID_URL = r'''(?x)
(currently used by MTVIE and MySpaceIE)
'''
_VALID_URL = r'''(?x)
- (?:https?://
www\.
vevo\.com/watch/(?!playlist|genre)(?:[^/]+/(?:[^/]+/)?)?|
+ (?:https?://
(?:www\.)?
vevo\.com/watch/(?!playlist|genre)(?:[^/]+/(?:[^/]+/)?)?|
https?://cache\.vevo\.com/m/html/embed\.html\?video=|
https?://videoplayer\.vevo\.com/embed/embedded\?videoId=|
vevo:)
https?://cache\.vevo\.com/m/html/embed\.html\?video=|
https?://videoplayer\.vevo\.com/embed/embedded\?videoId=|
vevo:)
@@
-374,7
+374,7
@@
class VevoIE(VevoBaseIE):
class VevoPlaylistIE(VevoBaseIE):
class VevoPlaylistIE(VevoBaseIE):
- _VALID_URL = r'https?://
www\.
vevo\.com/watch/(?P<kind>playlist|genre)/(?P<id>[^/?#&]+)'
+ _VALID_URL = r'https?://
(?:www\.)?
vevo\.com/watch/(?P<kind>playlist|genre)/(?P<id>[^/?#&]+)'
_TESTS = [{
'url': 'http://www.vevo.com/watch/playlist/dadbf4e7-b99f-4184-9670-6f0e547b6a29',
_TESTS = [{
'url': 'http://www.vevo.com/watch/playlist/dadbf4e7-b99f-4184-9670-6f0e547b6a29',