X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=youtube_dl%2Fextractor%2Fxvideos.py;h=7e00448246beb9ab9b7c25f33b05e6f4f1bb8283;hb=af8812bb9b50586dd228c624b1bc569639070254;hp=4ee538b5038a08b778b3b03984a74770f299e1b6;hpb=714d709a31a8fbb8a0aee94df59730673c4c035b;p=youtube-dl.git diff --git a/youtube_dl/extractor/xvideos.py b/youtube_dl/extractor/xvideos.py index 4ee538b50..7e0044824 100644 --- a/youtube_dl/extractor/xvideos.py +++ b/youtube_dl/extractor/xvideos.py @@ -1,20 +1,25 @@ +from __future__ import unicode_literals + import re from .common import InfoExtractor from ..utils import ( compat_urllib_parse, + ExtractorError, + clean_html, ) class XVideosIE(InfoExtractor): _VALID_URL = r'^(?:https?://)?(?:www\.)?xvideos\.com/video([0-9]+)(?:.*)' _TEST = { - u'url': u'http://www.xvideos.com/video939581/funny_porns_by_s_-1', - u'file': u'939581.flv', - u'md5': u'1d0c835822f0a71a7bf011855db929d0', - u'info_dict': { - u"title": u"Funny Porns By >>>>S<<<<<< -1", - u"age_limit": 18, + 'url': 'http://www.xvideos.com/video4588838/biker_takes_his_girl', + 'md5': '4b46ae6ea5e6e9086e714d883313c0c9', + 'info_dict': { + 'id': '4588838', + 'ext': 'flv', + 'title': 'Biker Takes his Girl', + 'age_limit': 18, } } @@ -26,19 +31,23 @@ class XVideosIE(InfoExtractor): self.report_extraction(video_id) + mobj = re.search(r'