aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/extractor/tvnow.py
diff options
context:
space:
mode:
authorSergey M․ <dstftw@gmail.com>2019-06-08 00:45:28 +0700
committerSergey M․ <dstftw@gmail.com>2019-06-08 00:45:28 +0700
commite75220b11af01fcee6ca40847a1b94ccd0bce8a3 (patch)
tree3e93e6b21c519b7a6496647babd92a01a73e5a84 /youtube_dl/extractor/tvnow.py
parent2efefddafd1c83a900b091c0051f84a1ba2fcbfa (diff)
downloadyoutube-dl-e75220b11af01fcee6ca40847a1b94ccd0bce8a3.tar.xz
[tvnow] Extract HD formats (closes #21201)
Diffstat (limited to 'youtube_dl/extractor/tvnow.py')
-rw-r--r--youtube_dl/extractor/tvnow.py26
1 files changed, 17 insertions, 9 deletions
diff --git a/youtube_dl/extractor/tvnow.py b/youtube_dl/extractor/tvnow.py
index ecd0fb937..9c8a8a0dc 100644
--- a/youtube_dl/extractor/tvnow.py
+++ b/youtube_dl/extractor/tvnow.py
@@ -47,15 +47,23 @@ class TVNowBaseIE(InfoExtractor):
r'\.ism/(?:[^.]*\.(?:m3u8|mpd)|[Mm]anifest)',
'.ism/' + suffix, manifest_url))
- formats = self._extract_mpd_formats(
- url_repl('dash', '.mpd'), video_id,
- mpd_id='dash', fatal=False)
- formats.extend(self._extract_ism_formats(
- url_repl('hss', 'Manifest'),
- video_id, ism_id='mss', fatal=False))
- formats.extend(self._extract_m3u8_formats(
- url_repl('hls', '.m3u8'), video_id, 'mp4',
- 'm3u8_native', m3u8_id='hls', fatal=False))
+ def make_urls(proto, suffix):
+ urls = [url_repl(proto, suffix)]
+ hd_url = urls[0].replace('/manifest/', '/ngvod/')
+ if hd_url != urls[0]:
+ urls.append(hd_url)
+ return urls
+
+ for man_url in make_urls('dash', '.mpd'):
+ formats = self._extract_mpd_formats(
+ man_url, video_id, mpd_id='dash', fatal=False)
+ for man_url in make_urls('hss', 'Manifest'):
+ formats.extend(self._extract_ism_formats(
+ man_url, video_id, ism_id='mss', fatal=False))
+ for man_url in make_urls('hls', '.m3u8'):
+ formats.extend(self._extract_m3u8_formats(
+ man_url, video_id, 'mp4', 'm3u8_native', m3u8_id='hls',
+ fatal=False))
if formats:
break
else: