diff options
| author | Sergey M․ <dstftw@gmail.com> | 2019-03-17 15:34:21 +0700 |
|---|---|---|
| committer | Sergey M․ <dstftw@gmail.com> | 2019-03-17 15:34:21 +0700 |
| commit | 04988b55b54bd7bd803d43a56f87e4728158890a (patch) | |
| tree | cb9c2e43d26ff5084b542d0107753194cc535793 | |
| parent | 034f5fb5ee37e9edf90f7e82f48af985cdd17901 (diff) | |
| download | youtube-dl-04988b55b54bd7bd803d43a56f87e4728158890a.tar.gz youtube-dl-04988b55b54bd7bd803d43a56f87e4728158890a.tar.xz youtube-dl-04988b55b54bd7bd803d43a56f87e4728158890a.zip | |
[openload] Improve embed detection
| -rw-r--r-- | youtube_dl/extractor/openload.py | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/youtube_dl/extractor/openload.py b/youtube_dl/extractor/openload.py index bae7c7ee7..cc323e5e2 100644 --- a/youtube_dl/extractor/openload.py +++ b/youtube_dl/extractor/openload.py @@ -243,18 +243,16 @@ class PhantomJSwrapper(object): class OpenloadIE(InfoExtractor): + _DOMAINS = r'(?:openload\.(?:co|io|link|pw)|oload\.(?:tv|stream|site|xyz|win|download|cloud|cc|icu|fun|club|info|pw|live|space))' _VALID_URL = r'''(?x) https?:// (?P<host> (?:www\.)? - (?: - openload\.(?:co|io|link|pw)| - oload\.(?:tv|stream|site|xyz|win|download|cloud|cc|icu|fun|club|info|pw|live|space) - ) + %s )/ (?:f|embed)/ (?P<id>[a-zA-Z0-9-_]+) - ''' + ''' % _DOMAINS _TESTS = [{ 'url': 'https://openload.co/f/kUEfGclsU9o', @@ -359,8 +357,8 @@ class OpenloadIE(InfoExtractor): @staticmethod def _extract_urls(webpage): return re.findall( - r'<iframe[^>]+src=["\']((?:https?://)?(?:openload\.(?:co|io)|oload\.tv)/embed/[a-zA-Z0-9-_]+)', - webpage) + r'<iframe[^>]+src=["\']((?:https?://)?%s/embed/[a-zA-Z0-9-_]+)' + % OpenloadIE._DOMAINS, webpage) def _real_extract(self, url): mobj = re.match(self._VALID_URL, url) |