Browse Source

[TNAFlix] Allow dot (and more) in cat_id and display_id

URLs with dots were raising a "UnsupportedError: Unsupported URL" error.
totalwebcasting
frenchy1983 10 years ago
parent
commit
e7752cd578
1 changed files with 8 additions and 8 deletions
  1. +8
    -8
      youtube_dl/extractor/tnaflix.py

+ 8
- 8
youtube_dl/extractor/tnaflix.py View File

@ -10,23 +10,23 @@ 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 = { _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': { 'info_dict': {
'id': '553878',
'display_id': 'Carmella-Decesare-striptease',
'id': '358632',
'display_id': 'bunzHD-Ms.Donk',
'ext': 'mp4', '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$', 'thumbnail': 're:https?://.*\.jpg$',
'duration': 91,
'duration': 394,
'age_limit': 18, 'age_limit': 18,
} }
} }


Loading…
Cancel
Save