[liveleak] Add support for youtube embeds

This commit is contained in:
Varun 2016-11-29 22:07:30 +05:30 committed by Sergey M
parent 6303fc8204
commit 3779d524df

View File

@ -54,6 +54,19 @@ class LiveLeakIE(InfoExtractor):
'title': 'Crazy Hungarian tourist films close call waterspout in Croatia', 'title': 'Crazy Hungarian tourist films close call waterspout in Croatia',
'thumbnail': 're:^https?://.*\.jpg$' 'thumbnail': 're:^https?://.*\.jpg$'
} }
}, {
# Covers https://github.com/rg3/youtube-dl/pull/10664#issuecomment-247439521
'url' : 'http://m.liveleak.com/view?i=763_1473349649',
'add_ie': ['Youtube'],
'info_dict': {
'id': '763_1473349649',
'ext': 'mp4',
'title': 'Reporters and public officials ignore epidemic of black on asian violence in Sacramento | Colin Flaherty',
'description': 'Colin being the warrior he is and showing the injustice Asians in Sacramento are being subjected to.',
'uploader': 'Ziz',
'upload_date': '20160908',
'uploader_id': 'UCEbta5E_jqlZmEJsriTEtnw'
}
}] }]
@staticmethod @staticmethod
@ -87,7 +100,7 @@ class LiveLeakIE(InfoExtractor):
else: else:
# Maybe an embed? # Maybe an embed?
embed_url = self._search_regex( embed_url = self._search_regex(
r'<iframe[^>]+src="(http://www.prochan.com/embed\?[^"]+)"', r'<iframe[^>]+src="((?:(?:http://www.prochan.com/embed\?)|(?:http://www.youtube.com/embed))[^"]+)"',
webpage, 'embed URL') webpage, 'embed URL')
return { return {
'_type': 'url_transparent', '_type': 'url_transparent',
@ -107,6 +120,7 @@ class LiveLeakIE(InfoExtractor):
'format_note': s.get('label'), 'format_note': s.get('label'),
'url': s['file'], 'url': s['file'],
} for i, s in enumerate(sources)] } for i, s in enumerate(sources)]
for i, s in enumerate(sources): for i, s in enumerate(sources):
# Removing '.h264_*.mp4' gives the raw video, which is essentially # Removing '.h264_*.mp4' gives the raw video, which is essentially
# the same video without the LiveLeak logo at the top (see # the same video without the LiveLeak logo at the top (see