[extractor/sibnet] Separate from VKIE

Fixes https://github.com/yt-dlp/yt-dlp/commit/bfd973ece3369c593b5e82a88cc16de80088a73e#commitcomment-91834251

diff --git a/yt_dlp/extractor/_extractors.py b/yt_dlp/extractor/_extractors.py
index 2fe15f6d286e3ed12029cc2505c24729b967c5dc..13728408931768e6e0fc779714416c2a3060f585 100644 (file)
--- a/yt_dlp/extractor/_extractors.py
+++ b/yt_dlp/extractor/_extractors.py
@@ -1639,6 +1639,7 @@
     VivoIE,
 )
 from .sharevideos import ShareVideosEmbedIE
+from .sibnet import SibnetEmbedIE
 from .shemaroome import ShemarooMeIE
 from .showroomlive import ShowRoomLiveIE
 from .simplecast import (

diff --git a/yt_dlp/extractor/generic.py b/yt_dlp/extractor/generic.py
index 2fcbc6f43f830c68f51547b95d7de9952f89b43a..190aff3312f2242602ac9c73fcd2cb0c7ef81e62 100644 (file)
--- a/yt_dlp/extractor/generic.py
+++ b/yt_dlp/extractor/generic.py
@@ -1864,11 +1864,6 @@ class GenericIE(InfoExtractor):
                 'title': 'I AM BIO Podcast | BIO',
             },
             'playlist_mincount': 52,
-        },
-        {
-            # Sibnet embed (https://help.sibnet.ru/?sibnet_video_embed)
-            'url': 'https://phpbb3.x-tk.ru/bbcode-video-sibnet-t24.html',
-            'only_matching': True,
         }, {
             # WimTv embed player
             'url': 'http://www.msmotor.tv/wearefmi-pt-2-2021/',

diff --git a/yt_dlp/extractor/sibnet.py b/yt_dlp/extractor/sibnet.py
new file mode 100644 (file)
index 0000000..73bb75d
--- /dev/null
+++ b/yt_dlp/extractor/sibnet.py
@@ -0,0 +1,17 @@
+from .common import InfoExtractor
+
+
+class SibnetEmbedIE(InfoExtractor):
+    # Ref: https://help.sibnet.ru/?sibnet_video_embed
+    _VALID_URL = False
+    _EMBED_REGEX = [r'<iframe\b[^>]+\bsrc=(["\'])(?P<url>(?:https?:)?//video\.sibnet\.ru/shell\.php\?.*?\bvideoid=\d+.*?)\1']
+    _WEBPAGE_TESTS = [{
+        'url': 'https://phpbb3.x-tk.ru/bbcode-video-sibnet-t24.html',
+        'info_dict': {
+            'id': 'shell',  # FIXME?
+            'ext': 'mp4',
+            'age_limit': 0,
+            'thumbnail': 'https://video.sibnet.ru/upload/cover/video_1887072_0.jpg',
+            'title': 'КВН Москва не сразу строилась  - Девушка впервые играет в Mortal Kombat',
+        }
+    }]

diff --git a/yt_dlp/extractor/vk.py b/yt_dlp/extractor/vk.py
index 347aa381d0a55f0f74f57755f82d5fb095570927..0fb95c863ecd2ecc685d05dac41e1fbfc6f1050e 100644 (file)
--- a/yt_dlp/extractor/vk.py
+++ b/yt_dlp/extractor/vk.py
@@ -6,6 +6,7 @@
 from .dailymotion import DailymotionIE
 from .odnoklassniki import OdnoklassnikiIE
 from .pladform import PladformIE
+from .sibnet import SibnetEmbedIE
 from .vimeo import VimeoIE
 from .youtube import YoutubeIE
 from ..compat import compat_urlparse
@@ -101,8 +102,7 @@ class VKIE(VKBaseIE):
                             (?P<videoid>-?\d+_\d+)(?:.*\blist=(?P<list_id>([\da-f]+)|(ln-[\da-zA-Z]+)))?
                         )
                     '''
-    # https://help.sibnet.ru/?sibnet_video_embed
-    _EMBED_REGEX = [r'<iframe\b[^>]+\bsrc=(["\'])(?P<url>(?:https?:)?//video\.sibnet\.ru/shell\.php\?.*?\bvideoid=\d+.*?)\1']
+
     _TESTS = [
         {
             'url': 'http://vk.com/videos-77521?z=video-77521_162222515%2Fclub77521',
@@ -455,7 +455,7 @@ def _real_extract(self, url):
         if odnoklassniki_url:
             return self.url_result(odnoklassniki_url, OdnoklassnikiIE.ie_key())
 
-        sibnet_url = next(self._extract_embed_urls(url, info_page), None)
+        sibnet_url = next(SibnetEmbedIE._extract_embed_urls(url, info_page), None)
         if sibnet_url:
             return self.url_result(sibnet_url)