Mirrors
/
yt-dlp
mirror of https://github.com/yt-dlp/yt-dlp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[extractor] Support multiple `_VALID_URL`s (#5812) 

Authored by: nixxo
This commit is contained in:
pukkandan 2023-06-22 02:57:00 +05:30
parent 0dff8e4d1e
commit 5fd8367496
No known key found for this signature in database
GPG Key ID: 7EEE9E1E817D0A39
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
devscripts/lazy_load_template.py
View File

@ -6,6 +6,7 @@ from ..utils import (
age_restricted, age_restricted,
bug_reports_message, bug_reports_message,
classproperty, classproperty,
variadic,
write_string, write_string,
) )

8
yt_dlp/extractor/common.py
View File

@ -475,8 +475,8 @@ class InfoExtractor:
Subclasses of this should also be added to the list of extractors and Subclasses of this should also be added to the list of extractors and
should define a _VALID_URL regexp and, re-define the _real_extract() and should define _VALID_URL as a regexp or a Sequence of regexps, and
(optionally) _real_initialize() methods. re-define the _real_extract() and (optionally) _real_initialize() methods.
Subclasses may also override suitable() if necessary, but ensure the function Subclasses may also override suitable() if necessary, but ensure the function
signature is preserved and that this function imports everything it needs signature is preserved and that this function imports everything it needs
@ -566,8 +566,8 @@ class InfoExtractor:
# we have cached the regexp for *this* class, whereas getattr would also # we have cached the regexp for *this* class, whereas getattr would also
# match the superclass # match the superclass
if '_VALID_URL_RE' not in cls.__dict__: if '_VALID_URL_RE' not in cls.__dict__:
cls._VALID_URL_RE = re.compile(cls._VALID_URL) cls._VALID_URL_RE = tuple(map(re.compile, variadic(cls._VALID_URL)))
return cls._VALID_URL_RE.match(url) return next(filter(None, (regex.match(url) for regex in cls._VALID_URL_RE)), None)
@classmethod @classmethod
def suitable(cls, url): def suitable(cls, url):