diff options
| author | Tom-Oliver Heidel <github@tom-oliver.eu> | 2020-11-07 15:08:03 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-07 15:08:03 +0100 |
| commit | 4a82c025da48341785d94682b126ba94e7585540 (patch) | |
| tree | 663e979103c600c03892d556659b2ad6a207cbcb | |
| parent | 7d94c0674398da7aa026c920a1512589fcb3dbf0 (diff) | |
| parent | 8abd647c59c9eb8f0fefd2b329e62b2b32bac6ea (diff) | |
| download | hypervideo-pre-4a82c025da48341785d94682b126ba94e7585540.tar.lz hypervideo-pre-4a82c025da48341785d94682b126ba94e7585540.tar.xz hypervideo-pre-4a82c025da48341785d94682b126ba94e7585540.zip | |
Merge pull request #124 from nixxo/mailru-fix
[mailru] removed escaped braces, use urljoin, added tests
| -rw-r--r-- | youtube_dlc/extractor/mailru.py | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/youtube_dlc/extractor/mailru.py b/youtube_dlc/extractor/mailru.py index 6fdf70aa6..5bfe40649 100644 --- a/youtube_dlc/extractor/mailru.py +++ b/youtube_dlc/extractor/mailru.py @@ -12,6 +12,7 @@ from ..utils import ( parse_duration, remove_end, try_get, + urljoin, ) @@ -93,6 +94,14 @@ class MailRuIE(InfoExtractor): { 'url': 'https://my.mail.ru//list//sinyutin10/video/_myvideo/4.html', 'only_matching': True, + }, + { + 'url': 'https://my.mail.ru/mail/cloud-strife/video/embed/Games/2009', + 'only_matching': True, + }, + { + 'url': 'https://videoapi.my.mail.ru/videos/embed/mail/cloud-strife/Games/2009.html', + 'only_matching': True, } ] @@ -110,7 +119,7 @@ class MailRuIE(InfoExtractor): webpage = self._download_webpage(url, video_id) page_config = self._parse_json(self._search_regex([ r'(?s)<script[^>]+class="sp-video__page-config"[^>]*>(.+?)</script>', - r'(?s)"video":\s*(\{.+?\}),'], + r'(?s)"video":\s*({.+?}),'], webpage, 'page config', default='{}'), video_id, fatal=False) if page_config: meta_url = page_config.get('metaUrl') or page_config.get('video', {}).get('metaUrl') or page_config.get('metadataUrl') @@ -121,7 +130,7 @@ class MailRuIE(InfoExtractor): # fix meta_url if missing the host address if re.match(r'^\/\+\/', meta_url): - meta_url = 'https://my.mail.ru' + meta_url + meta_url = urljoin('https://my.mail.ru', meta_url) if meta_url: video_data = self._download_json( |