desastre
/
youtube-dl
forked from minhngoc25a/youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #5772 from frenchy1983/fix_tnaflix_regex 

[TNAFlix] Allow dot (and more) in cat_id and display_id
This commit is contained in:
Sergey M. 2015-05-24 17:54:25 +05:00
parent 23905927e1 ed5a637d62
commit b700055ba4
2 changed files with 34 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
youtube_dl/extractor/empflix.py
View File

@ -10,16 +10,18 @@ class EMPFlixIE(TNAFlixIE):
_DESCRIPTION_REGEX = r'name="description" value="([^"]*)"' _DESCRIPTION_REGEX = r'name="description" value="([^"]*)"'
_CONFIG_REGEX = r'flashvars\.config\s*=\s*escape\("([^"]+)"' _CONFIG_REGEX = r'flashvars\.config\s*=\s*escape\("([^"]+)"'
_TEST = { _TESTS = [
'url': 'http://www.empflix.com/videos/Amateur-Finger-Fuck-33051.html', {
'md5': 'b1bc15b6412d33902d6e5952035fcabc', 'url': 'http://www.empflix.com/videos/Amateur-Finger-Fuck-33051.html',
'info_dict': { 'md5': 'b1bc15b6412d33902d6e5952035fcabc',
'id': '33051', 'info_dict': {
'display_id': 'Amateur-Finger-Fuck', 'id': '33051',
'ext': 'mp4', 'display_id': 'Amateur-Finger-Fuck',
'title': 'Amateur Finger Fuck', 'ext': 'mp4',
'description': 'Amateur solo finger fucking.', 'title': 'Amateur Finger Fuck',
'thumbnail': 're:https?://.*\.jpg$', 'description': 'Amateur solo finger fucking.',
'age_limit': 18, 'thumbnail': 're:https?://.*\.jpg$',
'age_limit': 18,
}
} }
} ]

34
youtube_dl/extractor/tnaflix.py
View File

@ -10,26 +10,32 @@ from ..utils import (
class TNAFlixIE(InfoExtractor): class TNAFlixIE(InfoExtractor):
_VALID_URL = r'https?://(?:www\.)?tnaflix\.com/(?P<cat_id>[\w-]+)/(?P<display_id>[\w-]+)/video(?P<id>\d+)' _VALID_URL = r'https?://(?:www\.)?tnaflix\.com/(?P<cat_id>[^/]+)/(?P<display_id>[^/]+)/video(?P<id>\d+)'
_TITLE_REGEX = r'<title>(.+?) - TNAFlix Porn Videos</title>' _TITLE_REGEX = r'<title>(.+?) - TNAFlix Porn Videos</title>'
_DESCRIPTION_REGEX = r'<h3 itemprop="description">([^<]+)</h3>' _DESCRIPTION_REGEX = r'<h3 itemprop="description">([^<]+)</h3>'
_CONFIG_REGEX = r'flashvars\.config\s*=\s*escape\("([^"]+)"' _CONFIG_REGEX = r'flashvars\.config\s*=\s*escape\("([^"]+)"'
_TEST = { _TESTS = [
'url': 'http://www.tnaflix.com/porn-stars/Carmella-Decesare-striptease/video553878', {
'md5': 'ecf3498417d09216374fc5907f9c6ec0', 'url': 'http://www.tnaflix.com/porn-stars/Carmella-Decesare-striptease/video553878',
'info_dict': { 'md5': 'ecf3498417d09216374fc5907f9c6ec0',
'id': '553878', 'info_dict': {
'display_id': 'Carmella-Decesare-striptease', 'id': '553878',
'ext': 'mp4', 'display_id': 'Carmella-Decesare-striptease',
'title': 'Carmella Decesare - striptease', 'ext': 'mp4',
'description': '', 'title': 'Carmella Decesare - striptease',
'thumbnail': 're:https?://.*\.jpg$', 'description': '',
'duration': 91, 'thumbnail': 're:https?://.*\.jpg$',
'age_limit': 18, 'duration': 91,
'age_limit': 18,
}
},
{
'url': 'https://www.tnaflix.com/amateur-porn/bunzHD-Ms.Donk/video358632',
'matching_only': True,
} }
} ]
def _real_extract(self, url): def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url) mobj = re.match(self._VALID_URL, url)