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

[XHamsterIE] Extract mp4 video for hd and prefer flv over mp4

Browse Source
This commit is contained in:
rzhxeo 2014-02-08 07:15:29 +01:00
parent 8bc6c8e3c0
commit f0edc19104
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
youtube_dl/extractor/xhamster.py
View File

@ -14,8 +14,8 @@ class XHamsterIE(InfoExtractor):
_VALID_URL = r'(?:http://)?(?:www\.)?xhamster\.com/movies/(?P<id>[0-9]+)/(?P<seo>.+?)\.html(?:\?.*)?' _VALID_URL = r'(?:http://)?(?:www\.)?xhamster\.com/movies/(?P<id>[0-9]+)/(?P<seo>.+?)\.html(?:\?.*)?'
_TESTS = [{ _TESTS = [{
'url': 'http://xhamster.com/movies/1509445/femaleagent_shy_beauty_takes_the_bait.html', 'url': 'http://xhamster.com/movies/1509445/femaleagent_shy_beauty_takes_the_bait.html',
'file': '1509445.mp4', 'file': '1509445.flv',
'md5': '8281348b8d3c53d39fffb377d24eac4e', 'md5': '9f48e0e8d58e3076bb236ff412ab62fa',
'info_dict': { 'info_dict': {
"upload_date": "20121014", "upload_date": "20121014",
"uploader_id": "Ruseful2011", "uploader_id": "Ruseful2011",
@ -91,7 +91,6 @@ class XHamsterIE(InfoExtractor):
formats = [{ formats = [{
'url': video_url, 'url': video_url,
'format_id': 'hd' if hd else 'sd', 'format_id': 'hd' if hd else 'sd',
'preference': 0,
}] }]
video_mp4_url = extract_mp4_video_url(webpage) video_mp4_url = extract_mp4_video_url(webpage)
@ -100,7 +99,7 @@ class XHamsterIE(InfoExtractor):
'url': video_mp4_url, 'url': video_mp4_url,
'ext': 'mp4', 'ext': 'mp4',
'format_id': 'mp4-hd' if hd else 'mp4-sd', 'format_id': 'mp4-hd' if hd else 'mp4-sd',
'preference': 1, 'preference': -2, # download sometimes doesn't work (error 404)
}) })
if not hd: if not hd:
@ -111,8 +110,17 @@ class XHamsterIE(InfoExtractor):
formats.append({ formats.append({
'url': video_url, 'url': video_url,
'format_id': 'hd', 'format_id': 'hd',
'preference': 2, 'quality': 1,
}) })
video_mp4_url = extract_mp4_video_url(webpage)
if video_mp4_url is not None:
formats.append({
'url': video_mp4_url,
'ext': 'mp4',
'format_id': 'mp4-hd',
'quality': 1,
'preference': -2, # download sometimes doesn't work (error 404)
})
self._sort_formats(formats) self._sort_formats(formats)