Mirrors
/
youtube-dl
mirror of https://github.com/ytdl-org/youtube-dl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[thoughtworks] wistia regex modified

This commit is contained in:
dinesh 2014-10-23 21:23:56 +05:30
parent 52cffcb186
commit 85d7b76586
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
youtube_dl/extractor/generic.py
View File

@ -386,8 +386,9 @@ class GenericIE(InfoExtractor):
'info_dict': { 'info_dict': {
'id': 'uxjb0lwrcz', 'id': 'uxjb0lwrcz',
'ext': 'mp4', 'ext': 'mp4',
'title': 'Conversation about Hexagonal Rails Part 1', 'title': 'Conversation about Hexagonal Rails Part 1 - ThoughtWorks',
'duration': 1715.0, 'duration': 1715.0,
'uploader': 'thoughtworks.wistia.com',
}, },
}, },
] ]
@ -661,12 +662,8 @@ class GenericIE(InfoExtractor):
playlists, lambda p: '//dailymotion.com/playlist/%s' % p) playlists, lambda p: '//dailymotion.com/playlist/%s' % p)
# Look for embedded Wistia player # Look for embedded Wistia player
mobj = re.search(r'<meta content=(["\'])(?P<url>https?://fast\.wistia\.net/embed/iframe/(?P<id>[a-zA-Z0-9_]+)(["\']))', webpage)
if mobj:
return self.url_result(mobj.group('url'), 'Wistia')
match = re.search( match = re.search(
r'<iframe[^>]+?src=(["\'])(?P<url>(?:https?:)?//(?:fast\.)?wistia\.net/embed/iframe/.+?)\1', webpage) r'(?:<meta content|<iframe[^>]+?src)=(["\'])(?P<url>(?:https?:)?//(?:fast\.)?wistia\.net/embed/iframe/.+?)\1', webpage)
if match: if match:
embed_url = self._proto_relative_url( embed_url = self._proto_relative_url(
unescapeHTML(match.group('url'))) unescapeHTML(match.group('url')))