X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fporn91.py;h=20eac647a87c10ad405c5dd9394bd6b04d66e7f9;hb=0c92f1e96b004fc7a04eac0759f115a535c8e03a;hp=cdf308f3d7776a5a1366a765cdd170a210d2cb97;hpb=9ff811c5cddbf3481fdcd44e97cf3683a925b33f;p=youtube-dl diff --git a/youtube_dl/extractor/porn91.py b/youtube_dl/extractor/porn91.py index cdf308f3d..20eac647a 100644 --- a/youtube_dl/extractor/porn91.py +++ b/youtube_dl/extractor/porn91.py @@ -1,10 +1,12 @@ -# encoding: utf-8 +# coding: utf-8 from __future__ import unicode_literals -import re - -from ..compat import compat_urllib_parse from .common import InfoExtractor +from ..utils import ( + parse_duration, + int_or_none, + ExtractorError, +) class Porn91IE(InfoExtractor): @@ -13,47 +15,49 @@ class Porn91IE(InfoExtractor): _TEST = { 'url': 'http://91porn.com/view_video.php?viewkey=7e42283b4f5ab36da134', - 'md5': '6df8f6d028bc8b14f5dbd73af742fb20', + 'md5': '7fcdb5349354f40d41689bd0fa8db05a', 'info_dict': { 'id': '7e42283b4f5ab36da134', 'title': '18å²å¤§ä¸æ¼äº®å¦å¦¹ï¼æ°´å«©æ§æï¼åç½ä¸æ¬¡ï¼', - 'ext': 'mp4' + 'ext': 'mp4', + 'duration': 431, + 'age_limit': 18, } } def _real_extract(self, url): - mobj = re.match(self._VALID_URL, url) - video_id = mobj.group('id') - url = 'http://91porn.com/view_video.php?viewkey=%s' % video_id + video_id = self._match_id(url) self._set_cookie('91porn.com', 'language', 'cn_CN') - webpage = self._download_webpage(url, video_id, "get HTML content") + + webpage = self._download_webpage( + 'http://91porn.com/view_video.php?viewkey=%s' % video_id, video_id) + + if 'ä½ä¸ºæ¸¸å®¢ï¼ä½ æ¯å¤©åªå¯è§ç10个è§é¢' in webpage: + raise ExtractorError('91 Porn says: Daily limit 10 videos exceeded', expected=True) + title = self._search_regex( - r'