From 73843ae8acb378e986ab4e7bb3a525b2f6b53cf2 Mon Sep 17 00:00:00 2001 From: rr- Date: Wed, 22 Jun 2016 17:24:35 +0200 Subject: [PATCH] [xnxx] fix url regex The pattern has changed from "video123412" to "video-o8xa19". The changes maintain backwards compatibility with old-style URLs. --- youtube_dl/extractor/xnxx.py | 19 +++++++++++-------- 1 file 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[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[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)