浏览代码

[dplay] Add suport Discovery+ domains(closes #27680)

Remita Amine 4 年之前
父节点
当前提交
be1a3f2d11
共有 1 个文件被更改,包括 26 次插入3 次删除
  1. 26 3
      youtube_dl/extractor/dplay.py

+ 26 - 3
youtube_dl/extractor/dplay.py

@@ -17,7 +17,12 @@ from ..utils import (
 class DPlayIE(InfoExtractor):
 class DPlayIE(InfoExtractor):
     _VALID_URL = r'''(?x)https?://
     _VALID_URL = r'''(?x)https?://
         (?P<domain>
         (?P<domain>
-            (?:www\.)?(?P<host>dplay\.(?P<country>dk|fi|jp|se|no))|
+            (?:www\.)?(?P<host>d
+                (?:
+                    play\.(?P<country>dk|fi|jp|se|no)|
+                    iscoveryplus\.(?P<plus_country>dk|es|fi|it|se|no)
+                )
+            )|
             (?P<subdomain_country>es|it)\.dplay\.com
             (?P<subdomain_country>es|it)\.dplay\.com
         )/[^/]+/(?P<id>[^/]+/[^/?#]+)'''
         )/[^/]+/(?P<id>[^/]+/[^/?#]+)'''
 
 
@@ -126,6 +131,24 @@ class DPlayIE(InfoExtractor):
     }, {
     }, {
         'url': 'https://www.dplay.jp/video/gold-rush/24086',
         'url': 'https://www.dplay.jp/video/gold-rush/24086',
         'only_matching': True,
         'only_matching': True,
+    }, {
+        'url': 'https://www.discoveryplus.se/videos/nugammalt-77-handelser-som-format-sverige/nugammalt-77-handelser-som-format-sverige-101',
+        'only_matching': True,
+    }, {
+        'url': 'https://www.discoveryplus.dk/videoer/ted-bundy-mind-of-a-monster/ted-bundy-mind-of-a-monster',
+        'only_matching': True,
+    }, {
+        'url': 'https://www.discoveryplus.no/videoer/i-kongens-klr/sesong-1-episode-7',
+        'only_matching': True,
+    }, {
+        'url': 'https://www.discoveryplus.it/videos/biografie-imbarazzanti/luigi-di-maio-la-psicosi-di-stanislawskij',
+        'only_matching': True,
+    }, {
+        'url': 'https://www.discoveryplus.es/videos/la-fiebre-del-oro/temporada-8-episodio-1',
+        'only_matching': True,
+    }, {
+        'url': 'https://www.discoveryplus.fi/videot/shifting-gears-with-aaron-kaufman/episode-16',
+        'only_matching': True,
     }]
     }]
 
 
     def _get_disco_api_info(self, url, display_id, disco_host, realm, country):
     def _get_disco_api_info(self, url, display_id, disco_host, realm, country):
@@ -241,7 +264,7 @@ class DPlayIE(InfoExtractor):
         mobj = re.match(self._VALID_URL, url)
         mobj = re.match(self._VALID_URL, url)
         display_id = mobj.group('id')
         display_id = mobj.group('id')
         domain = mobj.group('domain').lstrip('www.')
         domain = mobj.group('domain').lstrip('www.')
-        country = mobj.group('country') or mobj.group('subdomain_country')
-        host = 'disco-api.' + domain if domain.startswith('dplay.') else 'eu2-prod.disco-api.com'
+        country = mobj.group('country') or mobj.group('subdomain_country') or mobj.group('plus_country')
+        host = 'disco-api.' + domain if domain[0] == 'd' else 'eu2-prod.disco-api.com'
         return self._get_disco_api_info(
         return self._get_disco_api_info(
             url, display_id, host, 'dplay' + country, country)
             url, display_id, host, 'dplay' + country, country)