projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6625bf2
)
[go] Add support for disneynow.com (closes #21528)
author
Sergey M․
<dstftw@gmail.com>
Thu, 27 Jun 2019 15:59:30 +0000
(22:59 +0700)
committer
Sergey M․
<dstftw@gmail.com>
Thu, 27 Jun 2019 15:59:30 +0000
(22:59 +0700)
youtube_dl/extractor/go.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/go.py
b/youtube_dl/extractor/go.py
index 206d89e8250ed78512f563022ee5ba52f4a82f06..5916f9a8f20b1a92ae63b2f4709a9d8bb8997fd0 100644
(file)
--- a/
youtube_dl/extractor/go.py
+++ b/
youtube_dl/extractor/go.py
@@
-36,7
+36,7
@@
class GoIE(AdobePassIE):
'resource_id': 'DisneyXD',
}
}
'resource_id': 'DisneyXD',
}
}
- _VALID_URL = r'https?://(?:(?
P<sub_domain>%s)\.)?go
\.com/(?:(?:[^/]+/)*(?P<id>vdka\w+)|(?:[^/]+/)*(?P<display_id>[^/?#]+))'\
+ _VALID_URL = r'https?://(?:(?
:(?P<sub_domain>%s)\.)?go|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',
@@
-71,6
+71,9
@@
class GoIE(AdobePassIE):
# brand 008
'url': 'http://disneynow.go.com/shows/minnies-bow-toons/video/happy-campers/vdka4872013',
'only_matching': True,
# brand 008
'url': 'http://disneynow.go.com/shows/minnies-bow-toons/video/happy-campers/vdka4872013',
'only_matching': True,
+ }, {
+ 'url': 'https://disneynow.com/shows/minnies-bow-toons/video/happy-campers/vdka4872013',
+ 'only_matching': True,
}]
def _extract_videos(self, brand, video_id='-1', show_id='-1'):
}]
def _extract_videos(self, brand, video_id='-1', show_id='-1'):
@@
-89,7
+92,7
@@
class GoIE(AdobePassIE):
# There may be inner quotes, e.g. data-video-id="'VDKA3609139'"
# from http://freeform.go.com/shows/shadowhunters/episodes/season-2/1-this-guilty-blood
r'data-video-id=["\']*(VDKA\w+)', webpage, 'video id',
# There may be inner quotes, e.g. data-video-id="'VDKA3609139'"
# from http://freeform.go.com/shows/shadowhunters/episodes/season-2/1-this-guilty-blood
r'data-video-id=["\']*(VDKA\w+)', webpage, 'video id',
- default=
None
)
+ default=
video_id
)
if not site_info:
brand = self._search_regex(
(r'data-brand=\s*["\']\s*(\d+)',
if not site_info:
brand = self._search_regex(
(r'data-brand=\s*["\']\s*(\d+)',