projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
--list-formats: Only add "@" if vbr is given
[youtube-dl]
/
youtube_dl
/
extractor
/
pornhub.py
diff --git
a/youtube_dl/extractor/pornhub.py
b/youtube_dl/extractor/pornhub.py
index 3dbd2ab699e31ab27c2e191ef757ac5e70eff940..d9135c6b929765e87b13e58f6fd6af5567c55199 100644
(file)
--- a/
youtube_dl/extractor/pornhub.py
+++ b/
youtube_dl/extractor/pornhub.py
@@
-6,14
+6,13
@@
from ..utils import (
compat_urllib_parse_urlparse,
compat_urllib_request,
compat_urllib_parse,
compat_urllib_parse_urlparse,
compat_urllib_request,
compat_urllib_parse,
- unescapeHTML,
)
from ..aes import (
aes_decrypt_text
)
class PornHubIE(InfoExtractor):
)
from ..aes import (
aes_decrypt_text
)
class PornHubIE(InfoExtractor):
- _VALID_URL = r'^(?:https?://)?(?:www\.)?(?P<url>pornhub\.com/view_video\.php\?viewkey=(?P<videoid>[0-9]+))'
+ _VALID_URL = r'^(?:https?://)?(?:www\.)?(?P<url>pornhub\.com/view_video\.php\?viewkey=(?P<videoid>[0-9
a-f
]+))'
_TEST = {
u'url': u'http://www.pornhub.com/view_video.php?viewkey=648719015',
u'file': u'648719015.mp4',
_TEST = {
u'url': u'http://www.pornhub.com/view_video.php?viewkey=648719015',
u'file': u'648719015.mp4',
@@
-21,6
+20,7
@@
class PornHubIE(InfoExtractor):
u'info_dict': {
u"uploader": u"BABES-COM",
u"title": u"Seductive Indian beauty strips down and fingers her pink pussy",
u'info_dict': {
u"uploader": u"BABES-COM",
u"title": u"Seductive Indian beauty strips down and fingers her pink pussy",
+ u"age_limit": 18
}
}
}
}
@@
-46,10
+46,10
@@
class PornHubIE(InfoExtractor):
formats = []
for video_url in video_urls:
formats = []
for video_url in video_urls:
- path = compat_urllib_parse_urlparse(
video_url
).path
- extension = os.path.splitext(
path
)[1][1:]
+ path = compat_urllib_parse_urlparse(
video_url
).path
+ extension = os.path.splitext(
path
)[1][1:]
format = path.split('/')[5].split('_')[:2]
format = path.split('/')[5].split('_')[:2]
- format = "-".join(
format
)
+ format = "-".join(
format
)
formats.append({
'url': video_url,
'ext': extension,
formats.append({
'url': video_url,
'ext': extension,
@@
-64,4
+64,5
@@
class PornHubIE(InfoExtractor):
'title': video_title,
'thumbnail': thumbnail,
'formats': formats,
'title': video_title,
'thumbnail': thumbnail,
'formats': formats,
+ 'age_limit': 18,
}
}