[extractors] Use new framework for existing embeds (#4307)

[yt-dlp.git] / yt_dlp / extractor / kinja.py

diff --git a/yt_dlp/extractor/kinja.py b/yt_dlp/extractor/kinja.py
index 79e3026d2f4a00e47299f6a1c2ac838cd5759f8d..3747d8eeaa6a0236095a32cef3a749899c45bde8 100644 (file)
--- a/yt_dlp/extractor/kinja.py
+++ b/yt_dlp/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 @@
     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,14 +116,8 @@ 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 = re.match(self._VALID_URL, url).groups()
+        video_type, video_id = self._match_valid_url(url).groups()
 
         provider = self._PROVIDER_MAP.get(video_type)
         if provider: