diff options
Diffstat (limited to 'hypervideo_dl/extractor/kinja.py')
| -rw-r--r-- | hypervideo_dl/extractor/kinja.py | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/hypervideo_dl/extractor/kinja.py b/hypervideo_dl/extractor/kinja.py index 1be8b48..df1386f 100644 --- a/hypervideo_dl/extractor/kinja.py +++ b/hypervideo_dl/extractor/kinja.py @@ -1,8 +1,3 @@ -# coding: utf-8 -from __future__ import unicode_literals - -import re - from .common import InfoExtractor from ..compat import ( compat_str, @@ -13,8 +8,6 @@ from ..utils import ( parse_iso8601, strip_or_none, try_get, - unescapeHTML, - urljoin, ) @@ -58,6 +51,7 @@ class KinjaEmbedIE(InfoExtractor): vine| youtube-(?:list|video) )-(?P<id>[^&]+)''' % (_DOMAIN_REGEX, _COMMON_REGEX) + _EMBED_REGEX = [rf'(?x)<iframe[^>]+?src=(?P<q>["\'])(?P<url>(?:(?:https?:)?//{_DOMAIN_REGEX})?{_COMMON_REGEX}(?:(?!\1).)+)\1'] _TESTS = [{ 'url': 'https://kinja.com/ajax/inset/iframe?id=fb-10103303356633621', 'only_matching': True, @@ -122,12 +116,6 @@ class KinjaEmbedIE(InfoExtractor): 'youtube-video': ('youtube.com/embed/', 'Youtube'), } - @staticmethod - def _extract_urls(webpage, url): - return [urljoin(url, unescapeHTML(mobj.group('url'))) for mobj in re.finditer( - r'(?x)<iframe[^>]+?src=(?P<q>["\'])(?P<url>(?:(?:https?:)?//%s)?%s(?:(?!\1).)+)\1' % (KinjaEmbedIE._DOMAIN_REGEX, KinjaEmbedIE._COMMON_REGEX), - webpage)] - def _real_extract(self, url): video_type, video_id = self._match_valid_url(url).groups() @@ -159,7 +147,6 @@ class KinjaEmbedIE(InfoExtractor): formats.extend(self._extract_m3u8_formats( m3u8_url, video_id, 'mp4', 'm3u8_native', m3u8_id='hls', fatal=False)) - self._sort_formats(formats) thumbnail = None poster = data.get('poster') or {} @@ -207,8 +194,6 @@ class KinjaEmbedIE(InfoExtractor): 'url': fallback_rendition_url, }) - self._sort_formats(formats) - return { 'id': video_id, 'title': title, |