[mediasite] Add extractor, subsume sandia and collegerama extractors

This commit is contained in:
felix 2016-11-12 21:52:02 +01:00 committed by Sergey M․
parent 2501d41ef4
commit 8056c8542d
No known key found for this signature in database
GPG key ID: 2C393E0F18A9236D
5 changed files with 195 additions and 160 deletions

View file

@ -2883,6 +2883,16 @@ class GenericIE(InfoExtractor):
return self.playlist_from_matches(
vshare_urls, video_id, video_title, ie=VShareIE.ie_key())
# Look for Mediasite embeds
mobj = re.search(r'''(?xi)
<iframe[^>]+src="((?:https?://[a-z0-9\-\.:\[\]]+)?
/Mediasite/Play/[0-9a-f]{32,34}(?:\?.*?)?)"
''', webpage)
if mobj is not None:
return self.url_result(smuggle_url(
compat_urlparse.urljoin(url, unescapeHTML(mobj.group(1))),
{ 'UrlReferrer': url }), 'Livestream')
def merge_dicts(dict1, dict2):
merged = {}
for k, v in dict1.items():