diff options
| author | Sergey M. <dstftw@gmail.com> | 2014-10-23 22:59:53 +0700 |
|---|---|---|
| committer | Sergey M. <dstftw@gmail.com> | 2014-10-23 22:59:53 +0700 |
| commit | 6283c10b1c4b6059f7b43cb479a04db0c41bb6c8 (patch) | |
| tree | 4e3c9dd318c1264898b4ea84ddfe17dfe8985945 /youtube_dl/extractor | |
| parent | 2399535fd1f2ef3125fcf6c1eabf76de53b9b8ae (diff) | |
| parent | 85d7b7658617895703a3645f14e76a65a1a2f7e6 (diff) | |
Merge pull request #4009 from Dineshs91/thoughtworks
[thoughtworks] wistia support added
Diffstat (limited to 'youtube_dl/extractor')
| -rw-r--r-- | youtube_dl/extractor/generic.py | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py index 9057a6beb..bf957fa3f 100644 --- a/youtube_dl/extractor/generic.py +++ b/youtube_dl/extractor/generic.py @@ -380,6 +380,17 @@ class GenericIE(InfoExtractor): 'uploader': 'education-portal.com', }, }, + { + 'url': 'http://thoughtworks.wistia.com/medias/uxjb0lwrcz', + 'md5': 'baf49c2baa8a7de5f3fc145a8506dcd4', + 'info_dict': { + 'id': 'uxjb0lwrcz', + 'ext': 'mp4', + 'title': 'Conversation about Hexagonal Rails Part 1 - ThoughtWorks', + 'duration': 1715.0, + 'uploader': 'thoughtworks.wistia.com', + }, + }, ] def report_following_redirect(self, new_url): @@ -652,7 +663,7 @@ class GenericIE(InfoExtractor): # Look for embedded Wistia player 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'))) @@ -664,6 +675,7 @@ class GenericIE(InfoExtractor): 'title': video_title, 'id': video_id, } + match = re.search(r'(?:id=["\']wistia_|data-wistia-?id=["\']|Wistia\.embed\(["\'])(?P<id>[^"\']+)', webpage) if match: return { |