diff --git a/youtube_dl/extractor/porn91.py b/youtube_dl/extractor/porn91.py index 20eac647a..570c501f0 100644 --- a/youtube_dl/extractor/porn91.py +++ b/youtube_dl/extractor/porn91.py @@ -2,6 +2,9 @@ from __future__ import unicode_literals from .common import InfoExtractor +from ..compat import ( + compat_urllib_parse_unquote +) from ..utils import ( parse_duration, int_or_none, @@ -36,15 +39,15 @@ class Porn91IE(InfoExtractor): raise ExtractorError('91 Porn says: Daily limit 10 videos exceeded', expected=True) title = self._search_regex( - r'
([^<]+)
', webpage, 'title') + r'

]+>([^<]+)

', webpage, 'title') title = title.replace('\n', '') video_link_url = self._search_regex( - r']+id=["\']fm-video_link[^>]+>([^<]+)', + r'document\.write\(strencode2\("([^"]+)"\)\);', webpage, 'video link') - videopage = self._download_webpage(video_link_url, video_id) - - info_dict = self._parse_html5_media_entries(url, videopage, video_id)[0] + video_link_url = compat_urllib_parse_unquote(video_link_url) + video_link_url = self._search_regex( + r"src=\'([^\']+)\'", video_link_url, 'video link') duration = parse_duration(self._search_regex( r'时长:\s*\s*(\d+:\d+)', webpage, 'duration', fatal=False)) @@ -52,12 +55,12 @@ class Porn91IE(InfoExtractor): comment_count = int_or_none(self._search_regex( r'留言:\s*\s*(\d+)', webpage, 'comment count', fatal=False)) - info_dict.update({ + return { 'id': video_id, + 'url': video_link_url, + 'ext': 'mp4', 'title': title, 'duration': duration, 'comment_count': comment_count, - 'age_limit': self._rta_search(webpage), - }) - - return info_dict + 'age_limit': 18 + } \ No newline at end of file