R-yan/l1ving_youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into use-other-downloaders

Browse Source
This commit is contained in:
Rogério Brito 2013-10-19 17:05:00 -03:00
commit 9ef7cca548
5 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
setup.py
View File

@ -63,6 +63,7 @@ setup(
' YouTube.com and other video sites.', ' YouTube.com and other video sites.',
url='https://github.com/rg3/youtube-dl', url='https://github.com/rg3/youtube-dl',
author='Ricardo Garcia', author='Ricardo Garcia',
author_email='ytdl@yt-dl.org',
maintainer='Philipp Hagemeister', maintainer='Philipp Hagemeister',
maintainer_email='phihag@phihag.de', maintainer_email='phihag@phihag.de',
packages=['youtube_dl', 'youtube_dl.extractor'], packages=['youtube_dl', 'youtube_dl.extractor'],

3
youtube_dl/extractor/redtube.py
View File

@ -10,7 +10,8 @@ class RedTubeIE(InfoExtractor):
u'file': u'66418.mp4', u'file': u'66418.mp4',
u'md5': u'7b8c22b5e7098a3e1c09709df1126d2d', u'md5': u'7b8c22b5e7098a3e1c09709df1126d2d',
u'info_dict': { u'info_dict': {
u"title": u"Sucked on a toilet" u"title": u"Sucked on a toilet",
u"age_limit": 18,
} }
} }

11
youtube_dl/extractor/xhamster.py
View File

@ -19,7 +19,8 @@ class XHamsterIE(InfoExtractor):
u'info_dict': { u'info_dict': {
u"upload_date": u"20121014", u"upload_date": u"20121014",
u"uploader_id": u"Ruseful2011", 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,
} }
}, },
{ {
@ -29,7 +30,8 @@ class XHamsterIE(InfoExtractor):
u'info_dict': { u'info_dict': {
u"upload_date": u"20130914", u"upload_date": u"20130914",
u"uploader_id": u"jojo747400", u"uploader_id": u"jojo747400",
u"title": u"Britney Spears Sexy Booty" 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>[^\']+)\'', video_thumbnail = self._search_regex(r'\'image\':\'(?P<thumbnail>[^\']+)\'',
webpage, u'thumbnail', fatal=False) webpage, u'thumbnail', fatal=False)
age_limit = self._rta_search(webpage)
return [{ return [{
'id': video_id, 'id': video_id,
'url': video_url, 'url': video_url,
@ -80,5 +84,6 @@ class XHamsterIE(InfoExtractor):
'description': video_description, 'description': video_description,
'upload_date': video_upload_date, 'upload_date': video_upload_date,
'uploader_id': video_uploader_id, 'uploader_id': video_uploader_id,
'thumbnail': video_thumbnail 'thumbnail': video_thumbnail,
'age_limit': age_limit,
}] }]

4
youtube_dl/extractor/xvideos.py
View File

@ -13,7 +13,8 @@ class XVideosIE(InfoExtractor):
u'file': u'939581.flv', u'file': u'939581.flv',
u'md5': u'1d0c835822f0a71a7bf011855db929d0', u'md5': u'1d0c835822f0a71a7bf011855db929d0',
u'info_dict': { u'info_dict': {
u"title": u"Funny Porns By >>>>S<<<<<< -1" u"title": u"Funny Porns By >>>>S<<<<<< -1",
u"age_limit": 18,
} }
} }
@ -46,6 +47,7 @@ class XVideosIE(InfoExtractor):
'ext': 'flv', 'ext': 'flv',
'thumbnail': video_thumbnail, 'thumbnail': video_thumbnail,
'description': None, 'description': None,
'age_limit': 18,
} }
return [info] return [info]

3
youtube_dl/extractor/youporn.py
View File

@ -26,7 +26,8 @@ class YouPornIE(InfoExtractor):
u"upload_date": u"20101221", u"upload_date": u"20101221",
u"description": u"Love & Sex Answers: http://bit.ly/DanAndJenn -- Is It Unhealthy To Masturbate Daily?", u"description": u"Love & Sex Answers: http://bit.ly/DanAndJenn -- Is It Unhealthy To Masturbate Daily?",
u"uploader": u"Ask Dan And Jennifer", u"uploader": u"Ask Dan And Jennifer",
u"title": u"Sex Ed: Is It Safe To Masturbate Daily?" u"title": u"Sex Ed: Is It Safe To Masturbate Daily?",
u"age_limit": 18,
} }
} }