projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
284acd5
)
[xhamster] Add support for age_limit (Instead of #1627)
author
Philipp Hagemeister
<phihag@phihag.de>
Sat, 19 Oct 2013 19:09:48 +0000
(21:09 +0200)
committer
Philipp Hagemeister
<phihag@phihag.de>
Sat, 19 Oct 2013 19:09:48 +0000
(21:09 +0200)
youtube_dl/extractor/xhamster.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/xhamster.py
b/youtube_dl/extractor/xhamster.py
index 361619694980d3260ff81aeed2d0d07294739a0e..81c4be3269150aafc72f6ff0980923119c299373 100644
(file)
--- a/
youtube_dl/extractor/xhamster.py
+++ b/
youtube_dl/extractor/xhamster.py
@@
-19,7
+19,8
@@
class XHamsterIE(InfoExtractor):
u'info_dict': {
u"upload_date": u"20121014",
u"uploader_id": u"Ruseful2011",
u'info_dict': {
u"upload_date": u"20121014",
u"uploader_id": u"Ruseful2011",
- u"title": u"FemaleAgent Shy beauty takes the bait"
+ u"title": u"FemaleAgent Shy beauty takes the bait",
+ u"age_limit": 18,
}
},
{
}
},
{
@@
-27,9
+28,10
@@
class XHamsterIE(InfoExtractor):
u'file': u'2221348.flv',
u'md5': u'e767b9475de189320f691f49c679c4c7',
u'info_dict': {
u'file': u'2221348.flv',
u'md5': u'e767b9475de189320f691f49c679c4c7',
u'info_dict': {
- u"upload_date": u"20130914",
- u"uploader_id": u"jojo747400",
- u"title": u"Britney Spears Sexy Booty"
+ u"upload_date": u"20130914",
+ u"uploader_id": u"jojo747400",
+ u"title": u"Britney Spears Sexy Booty",
+ u"age_limit": 18,
}
}]
}
}]
@@
-72,6
+74,8
@@
class XHamsterIE(InfoExtractor):
video_thumbnail = self._search_regex(r'\'image\':\'(?P<thumbnail>[^\']+)\'',
webpage, u'thumbnail', fatal=False)
video_thumbnail = self._search_regex(r'\'image\':\'(?P<thumbnail>[^\']+)\'',
webpage, u'thumbnail', fatal=False)
+ age_limit = self._rta_search(webpage)
+
return [{
'id': video_id,
'url': video_url,
return [{
'id': video_id,
'url': video_url,
@@
-80,5
+84,6
@@
class XHamsterIE(InfoExtractor):
'description': video_description,
'upload_date': video_upload_date,
'uploader_id': video_uploader_id,
'description': video_description,
'upload_date': video_upload_date,
'uploader_id': video_uploader_id,
- 'thumbnail': video_thumbnail
+ 'thumbnail': video_thumbnail,
+ 'age_limit': age_limit,
}]
}]