diff options
| author | Unknown <blackjack4494@web.de> | 2020-10-07 05:34:22 +0200 |
|---|---|---|
| committer | Unknown <blackjack4494@web.de> | 2020-10-07 05:34:22 +0200 |
| commit | b777004649bcf2c5eb86c12a525ccb327ab55126 (patch) | |
| tree | 32d38305514dd5c2864f313504cb643897f7f3c8 /youtube_dlc/extractor | |
| parent | dbae42cb81ac340efe9d74f35d0371136192e3f7 (diff) | |
| download | hypervideo-pre-b777004649bcf2c5eb86c12a525ccb327ab55126.tar.lz hypervideo-pre-b777004649bcf2c5eb86c12a525ccb327ab55126.tar.xz hypervideo-pre-b777004649bcf2c5eb86c12a525ccb327ab55126.zip | |
Merge branch 'ytdl-org-master'
Diffstat (limited to 'youtube_dlc/extractor')
| -rw-r--r-- | youtube_dlc/extractor/expressen.py | 7 | ||||
| -rw-r--r-- | youtube_dlc/extractor/iprima.py | 3 |
2 files changed, 7 insertions, 3 deletions
diff --git a/youtube_dlc/extractor/expressen.py b/youtube_dlc/extractor/expressen.py index f79365038..dc8b855d2 100644 --- a/youtube_dlc/extractor/expressen.py +++ b/youtube_dlc/extractor/expressen.py @@ -15,7 +15,7 @@ from ..utils import ( class ExpressenIE(InfoExtractor): _VALID_URL = r'''(?x) https?:// - (?:www\.)?expressen\.se/ + (?:www\.)?(?:expressen|di)\.se/ (?:(?:tvspelare/video|videoplayer/embed)/)? tv/(?:[^/]+/)* (?P<id>[^/?#&]+) @@ -42,13 +42,16 @@ class ExpressenIE(InfoExtractor): }, { 'url': 'https://www.expressen.se/videoplayer/embed/tv/ditv/ekonomistudion/experterna-har-ar-fragorna-som-avgor-valet/?embed=true&external=true&autoplay=true&startVolume=0&partnerId=di', 'only_matching': True, + }, { + 'url': 'https://www.di.se/videoplayer/embed/tv/ditv/borsmorgon/implantica-rusar-70--under-borspremiaren-hor-styrelsemedlemmen/?embed=true&external=true&autoplay=true&startVolume=0&partnerId=di', + 'only_matching': True, }] @staticmethod def _extract_urls(webpage): return [ mobj.group('url') for mobj in re.finditer( - r'<iframe[^>]+\bsrc=(["\'])(?P<url>(?:https?:)?//(?:www\.)?expressen\.se/(?:tvspelare/video|videoplayer/embed)/tv/.+?)\1', + r'<iframe[^>]+\bsrc=(["\'])(?P<url>(?:https?:)?//(?:www\.)?(?:expressen|di)\.se/(?:tvspelare/video|videoplayer/embed)/tv/.+?)\1', webpage)] def _real_extract(self, url): diff --git a/youtube_dlc/extractor/iprima.py b/youtube_dlc/extractor/iprima.py index 53a550c11..648ae6741 100644 --- a/youtube_dlc/extractor/iprima.py +++ b/youtube_dlc/extractor/iprima.py @@ -86,7 +86,8 @@ class IPrimaIE(InfoExtractor): (r'<iframe[^>]+\bsrc=["\'](?:https?:)?//(?:api\.play-backend\.iprima\.cz/prehravac/embedded|prima\.iprima\.cz/[^/]+/[^/]+)\?.*?\bid=(p\d+)', r'data-product="([^"]+)">', r'id=["\']player-(p\d+)"', - r'playerId\s*:\s*["\']player-(p\d+)'), + r'playerId\s*:\s*["\']player-(p\d+)', + r'\bvideos\s*=\s*["\'](p\d+)'), webpage, 'real id') playerpage = self._download_webpage( |