aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortheychx <boomingzooming@gmail.com>2017-08-28 21:35:57 +0200
committerSergey M․ <dstftw@gmail.com>2017-09-03 17:03:45 +0700
commit0b4a8eb3ac823c26b037eb368c114ce6d976c5c3 (patch)
treea78a593e88a7ec803d0f6df36aba380bad5d95f5
parentc1c1585b316995ca47b59e8dc1e3b463beb1c54a (diff)
downloadyoutube-dl-0b4a8eb3ac823c26b037eb368c114ce6d976c5c3.tar.xz
[vidme:user] Relax _VALID_URLs
-rw-r--r--youtube_dl/extractor/vidme.py34
1 files changed, 24 insertions, 10 deletions
diff --git a/youtube_dl/extractor/vidme.py b/youtube_dl/extractor/vidme.py
index a7971d72e..39b65ed2f 100644
--- a/youtube_dl/extractor/vidme.py
+++ b/youtube_dl/extractor/vidme.py
@@ -263,29 +263,43 @@ class VidmeListBaseIE(InfoExtractor):
class VidmeUserIE(VidmeListBaseIE):
IE_NAME = 'vidme:user'
- _VALID_URL = r'https?://vid\.me/(?:e/)?(?P<id>[\da-zA-Z]{6,})(?!/likes)(?:[^\da-zA-Z]|$)'
+ _VALID_URL = r'https?://vid\.me/(?:e/)?(?P<id>[\da-zA-Z_-]{6,})(?!/likes)(?:[^\da-zA-Z_-]|$)'
_API_ITEM = 'list'
_TITLE = 'Videos'
- _TEST = {
- 'url': 'https://vid.me/EFARCHIVE',
+ _TESTS = [{
+ 'url': 'https://vid.me/MasakoX',
'info_dict': {
- 'id': '3834632',
- 'title': 'EFARCHIVE - %s' % _TITLE,
+ 'id': '16112341',
+ 'title': 'MasakoX - %s' % _TITLE,
},
- 'playlist_mincount': 238,
- }
+ 'playlist_mincount': 191,
+ }, {
+ 'url': 'https://vid.me/unsQuare_netWork',
+ 'info_dict': {
+ 'id': '16148757',
+ 'title': 'unsQuare_netWork - %s' % _TITLE,
+ },
+ 'playlist_mincount': 73,
+ }]
class VidmeUserLikesIE(VidmeListBaseIE):
IE_NAME = 'vidme:user:likes'
- _VALID_URL = r'https?://vid\.me/(?:e/)?(?P<id>[\da-zA-Z]{6,})/likes'
+ _VALID_URL = r'https?://vid\.me/(?:e/)?(?P<id>[\da-zA-Z_-]{6,})/likes'
_API_ITEM = 'likes'
_TITLE = 'Likes'
- _TEST = {
+ _TESTS = [{
'url': 'https://vid.me/ErinAlexis/likes',
'info_dict': {
'id': '6483530',
'title': 'ErinAlexis - %s' % _TITLE,
},
'playlist_mincount': 415,
- }
+ }, {
+ 'url': 'https://vid.me/Kaleidoscope-Ish/likes',
+ 'info_dict': {
+ 'id': '16908594',
+ 'title': 'Kaleidoscope-Ish - %s' % _TITLE,
+ },
+ 'playlist_mincount': 43,
+ }]