diff options
| -rw-r--r-- | setup.py | 1 | ||||
| -rw-r--r-- | youtube_dl/extractor/xhamster.py | 8 |
2 files changed, 6 insertions, 3 deletions
@@ -63,6 +63,7 @@ setup( ' YouTube.com and other video sites.', url='https://github.com/rg3/youtube-dl', author='Ricardo Garcia', + author_email='ytdl@yt-dl.org', maintainer='Philipp Hagemeister', maintainer_email='phihag@phihag.de', packages=['youtube_dl', 'youtube_dl.extractor'], diff --git a/youtube_dl/extractor/xhamster.py b/youtube_dl/extractor/xhamster.py index f060d9066..81c4be326 100644 --- a/youtube_dl/extractor/xhamster.py +++ b/youtube_dl/extractor/xhamster.py @@ -28,8 +28,8 @@ class XHamsterIE(InfoExtractor): u'file': u'2221348.flv', u'md5': u'e767b9475de189320f691f49c679c4c7', u'info_dict': { - u"upload_date": u"20130914", - u"uploader_id": u"jojo747400", + u"upload_date": u"20130914", + u"uploader_id": u"jojo747400", u"title": u"Britney Spears Sexy Booty", u"age_limit": 18, } @@ -74,6 +74,8 @@ class XHamsterIE(InfoExtractor): 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, @@ -83,5 +85,5 @@ class XHamsterIE(InfoExtractor): 'upload_date': video_upload_date, 'uploader_id': video_uploader_id, 'thumbnail': video_thumbnail, - 'age_limit': 18, + 'age_limit': age_limit, }] |