diff options
Diffstat (limited to 'hypervideo_dl/extractor/panopto.py')
| -rw-r--r-- | hypervideo_dl/extractor/panopto.py | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/hypervideo_dl/extractor/panopto.py b/hypervideo_dl/extractor/panopto.py index 3388f7f..32c103b 100644 --- a/hypervideo_dl/extractor/panopto.py +++ b/hypervideo_dl/extractor/panopto.py @@ -1,4 +1,3 @@ -import re import calendar import json import functools @@ -73,15 +72,10 @@ class PanoptoBaseIE(InfoExtractor): def _parse_fragment(url): return {k: json.loads(v[0]) for k, v in compat_urlparse.parse_qs(compat_urllib_parse_urlparse(url).fragment).items()} - @staticmethod - def _extract_urls(webpage): - return [m.group('url') for m in re.finditer( - r'<iframe[^>]+src=["\'](?P<url>%s/Pages/(Viewer|Embed|Sessions/List)\.aspx[^"\']+)' % PanoptoIE.BASE_URL_RE, - webpage)] - class PanoptoIE(PanoptoBaseIE): _VALID_URL = PanoptoBaseIE.BASE_URL_RE + r'/Pages/(Viewer|Embed)\.aspx.*(?:\?|&)id=(?P<id>[a-f0-9-]+)' + _EMBED_REGEX = [rf'<iframe[^>]+src=["\'](?P<url>{PanoptoBaseIE.BASE_URL_RE}/Pages/(Viewer|Embed|Sessions/List)\.aspx[^"\']+)'] _TESTS = [ { 'url': 'https://demo.hosted.panopto.com/Panopto/Pages/Viewer.aspx?id=26b3ae9e-4a48-4dcc-96ba-0befba08a0fb', @@ -413,7 +407,6 @@ class PanoptoIE(PanoptoBaseIE): subtitles = self._merge_subtitles( podcast_subtitles, streams_subtitles, self.extract_subtitles(base_url, video_id, delivery)) - self._sort_formats(formats) self.mark_watched(base_url, video_id, delivery_info) return { |