diff options
Diffstat (limited to 'youtube_dl/extractor/generic.py')
| -rw-r--r-- | youtube_dl/extractor/generic.py | 23 | 
1 files changed, 23 insertions, 0 deletions
| diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py index 0dcbb39db..367f930dd 100644 --- a/youtube_dl/extractor/generic.py +++ b/youtube_dl/extractor/generic.py @@ -382,6 +382,19 @@ class GenericIE(InfoExtractor):                  'thumbnail': 're:^https?://.*\.jpg$',              },          }, +        # Wistia embed +        { +            'url': 'http://education-portal.com/academy/lesson/north-american-exploration-failed-colonies-of-spain-france-england.html#lesson', +            'md5': '8788b683c777a5cf25621eaf286d0c23', +            'info_dict': { +                'id': '1cfaf6b7ea', +                'ext': 'mov', +                'title': 'md5:51364a8d3d009997ba99656004b5e20d', +                'duration': 643.0, +                'filesize': 182808282, +                'uploader': 'education-portal.com', +            }, +        },      ]      def report_download_webpage(self, video_id): @@ -656,6 +669,16 @@ class GenericIE(InfoExtractor):                  'title': video_title,                  'id': video_id,              } +        match = re.search(r'(?:id=["\']wistia_|data-wistiaid=["\']|Wistia\.embed\(["\'])(?P<id>[^"\']+)', webpage) +        if match: +            return { +                '_type': 'url_transparent', +                'url': 'http://fast.wistia.net/embed/iframe/{0:}'.format(match.group('id')), +                'ie_key': 'Wistia', +                'uploader': video_uploader, +                'title': video_title, +                'id': match.group('id') +            }          # Look for embedded blip.tv player          mobj = re.search(r'<meta\s[^>]*https?://api\.blip\.tv/\w+/redirect/\w+/(\d+)', webpage) | 
