projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[porn91] Catch daily limit error
[youtube-dl]
/
youtube_dl
/
extractor
/
porn91.py
diff --git
a/youtube_dl/extractor/porn91.py
b/youtube_dl/extractor/porn91.py
index 377ca2c773289126f4a9534e2fe0cffd586e9e2e..c119c7e94a6633ae12b7a36666e098086069d1d7 100644
(file)
--- a/
youtube_dl/extractor/porn91.py
+++ b/
youtube_dl/extractor/porn91.py
@@
-3,6
+3,11
@@
from __future__ import unicode_literals
from ..compat import compat_urllib_parse
from .common import InfoExtractor
from ..compat import compat_urllib_parse
from .common import InfoExtractor
+from ..utils import (
+ parse_duration,
+ int_or_none,
+ ExtractorError,
+)
class Porn91IE(InfoExtractor):
class Porn91IE(InfoExtractor):
@@
-15,7
+20,8
@@
class Porn91IE(InfoExtractor):
'info_dict': {
'id': '7e42283b4f5ab36da134',
'title': '18岁大一漂亮学妹,水嫩性感,再爽一次!',
'info_dict': {
'id': '7e42283b4f5ab36da134',
'title': '18岁大一漂亮学妹,水嫩性感,再爽一次!',
- 'ext': 'mp4'
+ 'ext': 'mp4',
+ 'duration': 431,
}
}
}
}
@@
-24,6
+30,10
@@
class Porn91IE(InfoExtractor):
url = 'http://91porn.com/view_video.php?viewkey=%s' % video_id
self._set_cookie('91porn.com', 'language', 'cn_CN')
webpage = self._download_webpage(url, video_id, "get HTML content")
url = 'http://91porn.com/view_video.php?viewkey=%s' % video_id
self._set_cookie('91porn.com', 'language', 'cn_CN')
webpage = self._download_webpage(url, video_id, "get HTML content")
+
+ if '作为游客,你每天只可观看10个视频' in webpage:
+ raise ExtractorError('91 Porn says: Daily limit 10 videos exceeded', expected=True)
+
title = self._search_regex(
r'<div id="viewvideo-title">([^<]+)</div>', webpage, 'title')
title = title.replace('\n', '')
title = self._search_regex(
r'<div id="viewvideo-title">([^<]+)</div>', webpage, 'title')
title = title.replace('\n', '')
@@
-46,8
+56,16
@@
class Porn91IE(InfoExtractor):
"get real video url")
video_url = self._search_regex(r'file=([^&]+)&', info_cn, 'url')
"get real video url")
video_url = self._search_regex(r'file=([^&]+)&', info_cn, 'url')
+ duration = parse_duration(self._search_regex(
+ r'时长:\s*</span>\s*(\d+:\d+)', webpage, 'duration', fatal=False))
+
+ comment_count = int_or_none(self._search_regex(
+ r'留言:\s*</span>\s*(\d+)', webpage, 'comment count', fatal=False))
+
return {
'id': video_id,
'title': title,
'url': video_url,
return {
'id': video_id,
'title': title,
'url': video_url,
+ 'duration': duration,
+ 'comment_count': comment_count,
}
}