From bfd973ece3369c593b5e82a88cc16de80088a73e Mon Sep 17 00:00:00 2001 From: pukkandan Date: Mon, 1 Aug 2022 06:53:25 +0530 Subject: [extractors] Use new framework for existing embeds (#4307) `Brightcove` is difficult to migrate because it's subclasses may depend on the signature of the current functions. So it is left as-is for now Note: Tests have not been migrated --- yt_dlp/extractor/rutube.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'yt_dlp/extractor/rutube.py') diff --git a/yt_dlp/extractor/rutube.py b/yt_dlp/extractor/rutube.py index ecfcea939..380c5e14e 100644 --- a/yt_dlp/extractor/rutube.py +++ b/yt_dlp/extractor/rutube.py @@ -1,4 +1,3 @@ -import re import itertools from .common import InfoExtractor @@ -94,6 +93,7 @@ class RutubeIE(RutubeBaseIE): IE_NAME = 'rutube' IE_DESC = 'Rutube videos' _VALID_URL = r'https?://rutube\.ru/(?:video|(?:play/)?embed)/(?P[\da-z]{32})' + _EMBED_REGEX = [r']+?src=(["\'])(?P(?:https?:)?//rutube\.ru/embed/[\da-z]{32}.*?)\1'] _TESTS = [{ 'url': 'http://rutube.ru/video/3eac3b4561676c17df9132a9a1e62e3e/', @@ -128,12 +128,6 @@ class RutubeIE(RutubeBaseIE): def suitable(cls, url): return False if RutubePlaylistIE.suitable(url) else super(RutubeIE, cls).suitable(url) - @staticmethod - def _extract_urls(webpage): - return [mobj.group('url') for mobj in re.finditer( - r']+?src=(["\'])(?P(?:https?:)?//rutube\.ru/embed/[\da-z]{32}.*?)\1', - webpage)] - def _real_extract(self, url): video_id = self._match_id(url) info = self._download_and_extract_info(video_id) -- cgit v1.2.3 From d42763a443107fa6a9d69c110f92c98857ca2406 Mon Sep 17 00:00:00 2001 From: coletdjnz Date: Sat, 24 Sep 2022 17:42:32 +1200 Subject: [extractor/rutube] Fix `_EMBED_REGEX` Closes https://github.com/yt-dlp/yt-dlp/issues/4797 Authored by: coletdjnz --- yt_dlp/extractor/rutube.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'yt_dlp/extractor/rutube.py') diff --git a/yt_dlp/extractor/rutube.py b/yt_dlp/extractor/rutube.py index 380c5e14e..34af0d594 100644 --- a/yt_dlp/extractor/rutube.py +++ b/yt_dlp/extractor/rutube.py @@ -93,7 +93,7 @@ class RutubeIE(RutubeBaseIE): IE_NAME = 'rutube' IE_DESC = 'Rutube videos' _VALID_URL = r'https?://rutube\.ru/(?:video|(?:play/)?embed)/(?P[\da-z]{32})' - _EMBED_REGEX = [r']+?src=(["\'])(?P(?:https?:)?//rutube\.ru/embed/[\da-z]{32}.*?)\1'] + _EMBED_REGEX = [r']+?src=(["\'])(?P(?:https?:)?//rutube\.ru/(?:play/)?embed/[\da-z]{32}.*?)\1'] _TESTS = [{ 'url': 'http://rutube.ru/video/3eac3b4561676c17df9132a9a1e62e3e/', -- cgit v1.2.3 From 6368e2e639bca7e66609911d2672b6a9dc65b052 Mon Sep 17 00:00:00 2001 From: pukkandan Date: Wed, 16 Nov 2022 06:27:43 +0530 Subject: [cleanup] Misc Closes #5541 --- yt_dlp/extractor/rutube.py | 1 - 1 file changed, 1 deletion(-) (limited to 'yt_dlp/extractor/rutube.py') diff --git a/yt_dlp/extractor/rutube.py b/yt_dlp/extractor/rutube.py index 34af0d594..cad3caa60 100644 --- a/yt_dlp/extractor/rutube.py +++ b/yt_dlp/extractor/rutube.py @@ -240,7 +240,6 @@ class RutubeMovieIE(RutubePlaylistBaseIE): IE_NAME = 'rutube:movie' IE_DESC = 'Rutube movies' _VALID_URL = r'https?://rutube\.ru/metainfo/tv/(?P\d+)' - _TESTS = [] _MOVIE_TEMPLATE = 'http://rutube.ru/api/metainfo/tv/%s/?format=json' _PAGE_TEMPLATE = 'http://rutube.ru/api/metainfo/tv/%s/video?page=%s&format=json' -- cgit v1.2.3 From 9f14daf22b4080ae1531a772ee7574959af4e2fa Mon Sep 17 00:00:00 2001 From: pukkandan Date: Thu, 17 Nov 2022 10:40:03 +0530 Subject: [extractor] Deprecate `_sort_formats` --- yt_dlp/extractor/rutube.py | 1 - 1 file changed, 1 deletion(-) (limited to 'yt_dlp/extractor/rutube.py') diff --git a/yt_dlp/extractor/rutube.py b/yt_dlp/extractor/rutube.py index cad3caa60..5a4fd975e 100644 --- a/yt_dlp/extractor/rutube.py +++ b/yt_dlp/extractor/rutube.py @@ -81,7 +81,6 @@ class RutubeBaseIE(InfoExtractor): 'url': format_url, 'format_id': format_id, }) - self._sort_formats(formats) return formats def _download_and_extract_formats(self, video_id, query=None): -- cgit v1.2.3