[24video] Add support for me and xxx TLDs

This commit is contained in:
Sergey M․ 2016-08-13 14:47:51 +07:00
parent 6a26c5f9d5
commit c366f8d30a
No known key found for this signature in database
GPG key ID: 2C393E0F18A9236D

View file

@ -12,32 +12,32 @@ from ..utils import (
class TwentyFourVideoIE(InfoExtractor): class TwentyFourVideoIE(InfoExtractor):
IE_NAME = '24video' IE_NAME = '24video'
_VALID_URL = r'https?://(?:www\.)?24video\.net/(?:video/(?:view|xml)/|player/new24_play\.swf\?id=)(?P<id>\d+)' _VALID_URL = r'https?://(?:www\.)?24video\.(?:net|me|xxx)/(?:video/(?:view|xml)/|player/new24_play\.swf\?id=)(?P<id>\d+)'
_TESTS = [ _TESTS = [{
{ 'url': 'http://www.24video.net/video/view/1044982',
'url': 'http://www.24video.net/video/view/1044982', 'md5': 'e09fc0901d9eaeedac872f154931deeb',
'md5': 'e09fc0901d9eaeedac872f154931deeb', 'info_dict': {
'info_dict': { 'id': '1044982',
'id': '1044982', 'ext': 'mp4',
'ext': 'mp4', 'title': 'Эротика каменного века',
'title': 'Эротика каменного века', 'description': 'Как смотрели порно в каменном веке.',
'description': 'Как смотрели порно в каменном веке.', 'thumbnail': 're:^https?://.*\.jpg$',
'thumbnail': 're:^https?://.*\.jpg$', 'uploader': 'SUPERTELO',
'uploader': 'SUPERTELO', 'duration': 31,
'duration': 31, 'timestamp': 1275937857,
'timestamp': 1275937857, 'upload_date': '20100607',
'upload_date': '20100607', 'age_limit': 18,
'age_limit': 18, 'like_count': int,
'like_count': int, 'dislike_count': int,
'dislike_count': int,
},
}, },
{ }, {
'url': 'http://www.24video.net/player/new24_play.swf?id=1044982', 'url': 'http://www.24video.net/player/new24_play.swf?id=1044982',
'only_matching': True, 'only_matching': True,
} }, {
] 'url': 'http://www.24video.me/video/view/1044982',
'only_matching': True,
}]
def _real_extract(self, url): def _real_extract(self, url):
video_id = self._match_id(url) video_id = self._match_id(url)