diff options
| author | dinesh <dsdiscoverdinesh@gmail.com> | 2014-10-23 21:23:56 +0530 |
|---|---|---|
| committer | dinesh <dsdiscoverdinesh@gmail.com> | 2014-10-23 21:23:56 +0530 |
| commit | 85d7b7658617895703a3645f14e76a65a1a2f7e6 (patch) | |
| tree | 66e5e8e3d2b2dc09e91209ff3718ed64b0b6f137 /youtube_dl | |
| parent | 52cffcb186432f9f1b30fba159414aff6a923f59 (diff) | |
| download | youtube-dl-85d7b7658617895703a3645f14e76a65a1a2f7e6.tar.xz | |
[thoughtworks] wistia regex modified
Diffstat (limited to 'youtube_dl')
| -rw-r--r-- | youtube_dl/extractor/generic.py | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py index 877447381..bf957fa3f 100644 --- a/youtube_dl/extractor/generic.py +++ b/youtube_dl/extractor/generic.py @@ -386,8 +386,9 @@ class GenericIE(InfoExtractor): 'info_dict': { 'id': 'uxjb0lwrcz', 'ext': 'mp4', - 'title': 'Conversation about Hexagonal Rails Part 1', + 'title': 'Conversation about Hexagonal Rails Part 1 - ThoughtWorks', 'duration': 1715.0, + 'uploader': 'thoughtworks.wistia.com', }, }, ] @@ -661,12 +662,8 @@ class GenericIE(InfoExtractor): playlists, lambda p: '//dailymotion.com/playlist/%s' % p) # 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( - 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: embed_url = self._proto_relative_url( unescapeHTML(match.group('url'))) |