projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[orf:tvthek] Make manifest requests non fatal (refs #22578)
[youtube-dl]
/
youtube_dl
/
extractor
/
go.py
diff --git
a/youtube_dl/extractor/go.py
b/youtube_dl/extractor/go.py
index 5916f9a8f20b1a92ae63b2f4709a9d8bb8997fd0..03e48f4ea4b93153ef445f0d9a66779144821361 100644
(file)
--- 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',
'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',
% '|'.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):
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:
site_info = self._SITE_INFO.get(sub_domain, {})
brand = site_info.get('brand')
if not video_id or not site_info: