diff options
| author | pukkandan <pukkandan.ytdlp@gmail.com> | 2021-04-21 15:40:55 +0530 |
|---|---|---|
| committer | pukkandan <pukkandan.ytdlp@gmail.com> | 2021-04-21 15:43:53 +0530 |
| commit | 3b4775e021ebe4c5da43b48bc6484a829f0bb9e2 (patch) | |
| tree | d72e7eb748fd80b25d0e9af6a2a1624ceee4c108 | |
| parent | ab406a1c0e7f0afde7e80818c0159bfa2847481f (diff) | |
| download | hypervideo-pre-3b4775e021ebe4c5da43b48bc6484a829f0bb9e2.tar.lz hypervideo-pre-3b4775e021ebe4c5da43b48bc6484a829f0bb9e2.tar.xz hypervideo-pre-3b4775e021ebe4c5da43b48bc6484a829f0bb9e2.zip | |
[go] Fix `_VALID_URL`
Closes #255
| -rw-r--r-- | yt_dlp/extractor/go.py | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/yt_dlp/extractor/go.py b/yt_dlp/extractor/go.py index dda08ae3e..c31e07a0c 100644 --- a/yt_dlp/extractor/go.py +++ b/yt_dlp/extractor/go.py @@ -8,6 +8,8 @@ from ..utils import ( int_or_none, determine_ext, parse_age_limit, + remove_start, + remove_end, urlencode_postdata, ExtractorError, ) @@ -46,15 +48,15 @@ class GoIE(AdobePassIE): } _VALID_URL = r'''(?x) https?:// - (?: - (?:(?P<sub_domain>%s)\.)?go| - (?P<sub_domain_2>abc|freeform|disneynow|fxnow\.fxnetworks) + (?P<sub_domain> + (?:%s\.)?go|fxnow\.fxnetworks| + (?:www\.)?(?:abc|freeform|disneynow) )\.com/ (?: (?:[^/]+/)*(?P<id>[Vv][Dd][Kk][Aa]\w+)| (?:[^/]+/)*(?P<display_id>[^/?\#]+) ) - ''' % '|'.join(list(_SITE_INFO.keys())) + ''' % r'\.|'.join(list(_SITE_INFO.keys())) _TESTS = [{ 'url': 'http://abc.go.com/shows/designated-survivor/video/most-recent/VDKA3807643', 'info_dict': { @@ -133,6 +135,9 @@ class GoIE(AdobePassIE): }, { 'url': 'https://disneynow.com/shows/minnies-bow-toons/video/happy-campers/vdka4872013', 'only_matching': True, + }, { + 'url': 'https://www.freeform.com/shows/cruel-summer/episode-guide/season-01/01-happy-birthday-jeanette-turner', + 'only_matching': True, }] def _extract_videos(self, brand, video_id='-1', show_id='-1'): @@ -143,7 +148,7 @@ class GoIE(AdobePassIE): def _real_extract(self, url): mobj = re.match(self._VALID_URL, url) - sub_domain = mobj.group('sub_domain') or mobj.group('sub_domain_2') + sub_domain = remove_start(remove_end(mobj.group('sub_domain') or '', '.go'), 'www.') video_id, display_id = mobj.group('id', 'display_id') site_info = self._SITE_INFO.get(sub_domain, {}) brand = site_info.get('brand') |