diff options
| author | frenchy1983 <frenchy1983@zoho.com> | 2015-05-21 11:47:16 +0200 | 
|---|---|---|
| committer | frenchy1983 <frenchy1983@zoho.com> | 2015-05-21 11:47:16 +0200 | 
| commit | e7752cd57853718c6875b02517613d14c4c7221d (patch) | |
| tree | 1b32f226ba19c09fce39ebbb76d8aaf0ce2c2159 /youtube_dl/extractor/tnaflix.py | |
| parent | 4d2f42361e02bb67de7c2017c6817b46ff3b2bd2 (diff) | |
[TNAFlix] Allow dot (and more) in cat_id and display_id
URLs with dots were raising a "UnsupportedError: Unsupported URL" error.
Diffstat (limited to 'youtube_dl/extractor/tnaflix.py')
| -rw-r--r-- | youtube_dl/extractor/tnaflix.py | 16 | 
1 files changed, 8 insertions, 8 deletions
| diff --git a/youtube_dl/extractor/tnaflix.py b/youtube_dl/extractor/tnaflix.py index d48cbbf14..725edd3c7 100644 --- a/youtube_dl/extractor/tnaflix.py +++ b/youtube_dl/extractor/tnaflix.py @@ -10,23 +10,23 @@ from ..utils import (  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>'      _DESCRIPTION_REGEX = r'<h3 itemprop="description">([^<]+)</h3>'      _CONFIG_REGEX = r'flashvars\.config\s*=\s*escape\("([^"]+)"'      _TEST = { -        'url': 'http://www.tnaflix.com/porn-stars/Carmella-Decesare-striptease/video553878', -        'md5': 'ecf3498417d09216374fc5907f9c6ec0', +        'url': 'https://www.tnaflix.com/amateur-porn/bunzHD-Ms.Donk/video358632', +        'md5': '6c431ea56756497e227fb3f01a687869',          'info_dict': { -            'id': '553878', -            'display_id': 'Carmella-Decesare-striptease', +            'id': '358632', +            'display_id': 'bunzHD-Ms.Donk',              'ext': 'mp4', -            'title': 'Carmella Decesare - striptease', -            'description': '', +            'title': 'bunzHD Ms.Donk', +            'description': 'bubble booty ebony teen goddess Ms.Donk has a firm ass and acts like she is shy but really she is a freak in the sheets watch her 20 min XX rated vid at bunzHD.com click on the catalog link',              'thumbnail': 're:https?://.*\.jpg$', -            'duration': 91, +            'duration': 394,              'age_limit': 18,          }      } | 
