aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--youtube_dl/extractor/xnxx.py19
1 files changed, 11 insertions, 8 deletions
diff --git a/youtube_dl/extractor/xnxx.py b/youtube_dl/extractor/xnxx.py
index 5a41f8ffa..f0d4cb9bc 100644
--- a/youtube_dl/extractor/xnxx.py
+++ b/youtube_dl/extractor/xnxx.py
@@ -6,17 +6,20 @@ from ..compat import compat_urllib_parse_unquote
class XNXXIE(InfoExtractor):
- _VALID_URL = r'^https?://(?:video|www)\.xnxx\.com/video(?P<id>[0-9]+)/(.*)'
- _TEST = {
- 'url': 'http://video.xnxx.com/video1135332/lida_naked_funny_actress_5_',
- 'md5': '0831677e2b4761795f68d417e0b7b445',
+ _VALID_URL = r'^https?://(?:video|www)\.xnxx\.com/video-?(?P<id>[0-9a-z]+)/(.*)'
+ _TESTS = [{
+ 'url': 'http://www.xnxx.com/video-6gqggeb/hd_star-581_sam',
+ 'md5': '6a2a6aff3f10467d94e572edb7b7deb6',
'info_dict': {
- 'id': '1135332',
+ 'id': '6gqggeb',
'ext': 'flv',
- 'title': 'lida ยป Naked Funny Actress (5)',
+ 'title': 'HD STAR-581 sam',
'age_limit': 18,
- }
- }
+ },
+ }, {
+ 'url': 'http://video.xnxx.com/video1135332/lida_naked_funny_actress_5_',
+ 'only_matching': True,
+ }]
def _real_extract(self, url):
video_id = self._match_id(url)