diff options
| author | Jesús <heckyel@hyperbola.info> | 2022-12-01 23:33:30 +0800 |
|---|---|---|
| committer | Jesús <heckyel@hyperbola.info> | 2022-12-01 23:33:30 +0800 |
| commit | ef1a420d6de7876b7b6732abc8ab78351c5a2bfc (patch) | |
| tree | 9ba7d8409aa5baa696f5fb10db5d395c2f050276 /yt_dlp/extractor/videomore.py | |
| parent | 16e8548f6a720a78679e417a20a300db2036bf6c (diff) | |
| parent | ddf1e22d48530819d60220d0bdc36e20f5b8483b (diff) | |
| download | hypervideo-pre-ef1a420d6de7876b7b6732abc8ab78351c5a2bfc.tar.lz hypervideo-pre-ef1a420d6de7876b7b6732abc8ab78351c5a2bfc.tar.xz hypervideo-pre-ef1a420d6de7876b7b6732abc8ab78351c5a2bfc.zip | |
update from upstream 2022-12-01 UTC+8
Diffstat (limited to 'yt_dlp/extractor/videomore.py')
| -rw-r--r-- | yt_dlp/extractor/videomore.py | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/yt_dlp/extractor/videomore.py b/yt_dlp/extractor/videomore.py index 09d12d192..ddc33f7d7 100644 --- a/yt_dlp/extractor/videomore.py +++ b/yt_dlp/extractor/videomore.py @@ -1,5 +1,3 @@ -import re - from .common import InfoExtractor from ..compat import ( compat_str, @@ -47,6 +45,12 @@ class VideomoreIE(InfoExtractor): (?P<id>\d+) (?:[/?#&]|\.(?:xml|json)|$) ''' + _EMBED_REGEX = [r'''(?x) + (?: + <iframe[^>]+src=([\'"])| + <object[^>]+data=(["\'])https?://videomore\.ru/player\.swf\?.*config= + )(?P<url>https?://videomore\.ru/[^?#"']+/\d+(?:\.xml)?) + '''] _TESTS = [{ 'url': 'http://videomore.ru/kino_v_detalayah/5_sezon/367617', 'md5': '44455a346edc0d509ac5b5a5b531dc35', @@ -126,19 +130,6 @@ class VideomoreIE(InfoExtractor): }] _GEO_BYPASS = False - @staticmethod - def _extract_url(webpage): - mobj = re.search( - r'<object[^>]+data=(["\'])https?://videomore\.ru/player\.swf\?.*config=(?P<url>https?://videomore\.ru/(?:[^/]+/)+\d+\.xml).*\1', - webpage) - if not mobj: - mobj = re.search( - r'<iframe[^>]+src=([\'"])(?P<url>https?://videomore\.ru/embed/\d+)', - webpage) - - if mobj: - return mobj.group('url') - def _real_extract(self, url): mobj = self._match_valid_url(url) video_id = mobj.group('sid') or mobj.group('id') @@ -190,7 +181,6 @@ class VideomoreIE(InfoExtractor): if error in ('Данное видео недоступно для просмотра на территории этой страны', 'Данное видео доступно для просмотра только на территории России'): self.raise_geo_restricted(countries=['RU'], metadata_available=True) self.raise_no_formats(error, expected=True) - self._sort_formats(formats) return { 'id': video_id, |