summary refs log tree commit diff
diff options
context:
space:
mode:
authorSergey M․ <dstftw@gmail.com>2019-07-04 04:01:30 +0700
committerSergey M․ <dstftw@gmail.com>2019-07-04 04:01:30 +0700
commita30c2f40550dd1ecc52c470db8ef77ea84bfe85b (patch)
treee314af176c4ab79b838594df12362a60ffa80a2b
parent5ae9b8b3a3063c97730b79ea1dfd39bc19fd56c9 (diff)
downloadyoutube-dl-a30c2f40550dd1ecc52c470db8ef77ea84bfe85b.tar.gz
youtube-dl-a30c2f40550dd1ecc52c470db8ef77ea84bfe85b.tar.xz
youtube-dl-a30c2f40550dd1ecc52c470db8ef77ea84bfe85b.zip
[go] Add site info for disneynow (closes #21613)
-rw-r--r--youtube_dl/extractor/go.py10
1 files changed, 8 insertions, 2 deletions
diff --git a/youtube_dl/extractor/go.py b/youtube_dl/extractor/go.py
index 5916f9a8f..03e48f4ea 100644
--- a/youtube_dl/extractor/go.py
+++ b/youtube_dl/extractor/go.py
@@ -34,9 +34,13 @@ class GoIE(AdobePassIE):
         'watchdisneyxd': {
             'brand': '009',
             'resource_id': 'DisneyXD',
+        },
+        'disneynow': {
+            'brand': '011',
+            'resource_id': 'Disney',
         }
     }
-    _VALID_URL = r'https?://(?:(?:(?P<sub_domain>%s)\.)?go|disneynow)\.com/(?:(?:[^/]+/)*(?P<id>vdka\w+)|(?:[^/]+/)*(?P<display_id>[^/?#]+))'\
+    _VALID_URL = r'https?://(?:(?:(?P<sub_domain>%s)\.)?go|(?P<sub_domain_2>disneynow))\.com/(?:(?:[^/]+/)*(?P<id>vdka\w+)|(?:[^/]+/)*(?P<display_id>[^/?#]+))'\
                  % '|'.join(list(_SITE_INFO.keys()) + ['disneynow'])
     _TESTS = [{
         'url': 'http://abc.go.com/shows/designated-survivor/video/most-recent/VDKA3807643',
@@ -83,7 +87,9 @@ class GoIE(AdobePassIE):
             display_id)['video']
 
     def _real_extract(self, url):
-        sub_domain, video_id, display_id = re.match(self._VALID_URL, url).groups()
+        mobj = re.match(self._VALID_URL, url)
+        sub_domain = mobj.group('sub_domain') or mobj.group('sub_domain_2')
+        video_id, display_id = mobj.group('id', 'display_id')
         site_info = self._SITE_INFO.get(sub_domain, {})
         brand = site_info.get('brand')
         if not video_id or not site_info: