projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[vk] Fix upload date extraction
[youtube-dl]
/
youtube_dl
/
extractor
/
porn91.py
diff --git
a/youtube_dl/extractor/porn91.py
b/youtube_dl/extractor/porn91.py
index ea1efc71b2b99d94206bf4bf2a2779964be585d1..72d1b2718692d902b16efa303f9a14dd7d456f1f 100644
(file)
--- a/
youtube_dl/extractor/porn91.py
+++ b/
youtube_dl/extractor/porn91.py
@@
-6,6
+6,7
@@
from .common import InfoExtractor
from ..utils import (
parse_duration,
int_or_none,
from ..utils import (
parse_duration,
int_or_none,
+ ExtractorError,
)
)
@@
-28,7
+29,11
@@
class Porn91IE(InfoExtractor):
video_id = self._match_id(url)
url = 'http://91porn.com/view_video.php?viewkey=%s' % video_id
self._set_cookie('91porn.com', 'language', 'cn_CN')
video_id = self._match_id(url)
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")
+ 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', '')
@@
-48,7
+53,7
@@
class Porn91IE(InfoExtractor):
})
info_cn = self._download_webpage(
'http://91porn.com/getfile.php?' + url_params, video_id,
})
info_cn = self._download_webpage(
'http://91porn.com/getfile.php?' + url_params, video_id,
-
"get real video url"
)
+
'get real video url'
)
video_url = self._search_regex(r'file=([^&]+)&', info_cn, 'url')
duration = parse_duration(self._search_regex(
video_url = self._search_regex(r'file=([^&]+)&', info_cn, 'url')
duration = parse_duration(self._search_regex(