diff options
| author | pukkandan <pukkandan.ytdlp@gmail.com> | 2022-12-08 17:17:16 +0530 | 
|---|---|---|
| committer | pukkandan <pukkandan.ytdlp@gmail.com> | 2022-12-08 17:20:02 +0530 | 
| commit | 7991ae57a800316930e20a15df8314616c5cba8f (patch) | |
| tree | 92ac100c4f69125c735e766eb347bad66b3777ca | |
| parent | 935bac1e4de35107a15ea2ad45402f507527dcfb (diff) | |
| download | hypervideo-pre-7991ae57a800316930e20a15df8314616c5cba8f.tar.lz hypervideo-pre-7991ae57a800316930e20a15df8314616c5cba8f.tar.xz hypervideo-pre-7991ae57a800316930e20a15df8314616c5cba8f.zip | |
[extractor/sibnet] Separate from VKIE
Fixes https://github.com/yt-dlp/yt-dlp/commit/bfd973ece3369c593b5e82a88cc16de80088a73e#commitcomment-91834251
| -rw-r--r-- | yt_dlp/extractor/_extractors.py | 1 | ||||
| -rw-r--r-- | yt_dlp/extractor/generic.py | 5 | ||||
| -rw-r--r-- | yt_dlp/extractor/sibnet.py | 17 | ||||
| -rw-r--r-- | yt_dlp/extractor/vk.py | 6 | 
4 files changed, 21 insertions, 8 deletions
| diff --git a/yt_dlp/extractor/_extractors.py b/yt_dlp/extractor/_extractors.py index 2fe15f6d2..137284089 100644 --- a/yt_dlp/extractor/_extractors.py +++ b/yt_dlp/extractor/_extractors.py @@ -1639,6 +1639,7 @@ from .shared import (      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 2fcbc6f43..190aff331 100644 --- 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 index 000000000..73bb75d8f --- /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 347aa381d..0fb95c863 100644 --- a/yt_dlp/extractor/vk.py +++ b/yt_dlp/extractor/vk.py @@ -6,6 +6,7 @@ from .common import InfoExtractor  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 @@ class VKIE(VKBaseIE):          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) | 
