laudom/haruhi-dl
2
0
Fork 0
Code Issues 13 Pull requests Projects Releases Packages Wiki Activity

[vidme:user] Relax _VALID_URLs

Browse source
This commit is contained in:
theychx 2017-08-28 21:35:57 +02:00 committed by Sergey M․
parent c1c1585b31
commit 0b4a8eb3ac
No known key found for this signature in database
GPG key ID: 2C393E0F18A9236D
1 changed files with 24 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
youtube_dl/extractor/vidme.py
View file

@ -263,29 +263,43 @@ class VidmeListBaseIE(InfoExtractor):
class VidmeUserIE(VidmeListBaseIE): class VidmeUserIE(VidmeListBaseIE):
IE_NAME = 'vidme:user' 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' _API_ITEM = 'list'
_TITLE = 'Videos' _TITLE = 'Videos'
_TEST = { _TESTS = [{
'url': 'https://vid.me/EFARCHIVE', 'url': 'https://vid.me/MasakoX',
'info_dict': { 'info_dict': {
'id': '3834632', 'id': '16112341',
'title': 'EFARCHIVE - %s' % _TITLE, '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): class VidmeUserLikesIE(VidmeListBaseIE):
IE_NAME = 'vidme:user:likes' 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' _API_ITEM = 'likes'
_TITLE = 'Likes' _TITLE = 'Likes'
_TEST = { _TESTS = [{
'url': 'https://vid.me/ErinAlexis/likes', 'url': 'https://vid.me/ErinAlexis/likes',
'info_dict': { 'info_dict': {
'id': '6483530', 'id': '6483530',
'title': 'ErinAlexis - %s' % _TITLE, 'title': 'ErinAlexis - %s' % _TITLE,
}, },
'playlist_mincount': 415, 'playlist_mincount': 415,
} }, {
'url': 'https://vid.me/Kaleidoscope-Ish/likes',
'info_dict': {
'id': '16908594',
'title': 'Kaleidoscope-Ish - %s' % _TITLE,
},
'playlist_mincount': 43,
}]