aboutsummaryrefslogtreecommitdiffstats
path: root/youtube_dl/extractor/disney.py
diff options
context:
space:
mode:
authorRogério Brito <rbrito@ime.usp.br>2018-01-04 03:48:45 -0200
committerRogério Brito <rbrito@ime.usp.br>2018-01-04 03:48:45 -0200
commitb4a0c9f9de9d715538a1718922d6ab01a40f7ce3 (patch)
tree2bd8b6c5ac3b08a19a6c6f173e332eddca024bd6 /youtube_dl/extractor/disney.py
parent32ad8acade51269177cd01c5aa3c7169557eeac8 (diff)
downloadyoutube-dl-b4a0c9f9de9d715538a1718922d6ab01a40f7ce3.zip
youtube-dl-b4a0c9f9de9d715538a1718922d6ab01a40f7ce3.tar.gz
youtube-dl-b4a0c9f9de9d715538a1718922d6ab01a40f7ce3.tar.bz2
New upstream version 2017.12.31
Diffstat (limited to 'youtube_dl/extractor/disney.py')
-rw-r--r--youtube_dl/extractor/disney.py12
1 files changed, 10 insertions, 2 deletions
diff --git a/youtube_dl/extractor/disney.py b/youtube_dl/extractor/disney.py
index 968c4c7..0eee82f 100644
--- a/youtube_dl/extractor/disney.py
+++ b/youtube_dl/extractor/disney.py
@@ -10,6 +10,7 @@ from ..utils import (
compat_str,
determine_ext,
ExtractorError,
+ update_url_query,
)
@@ -108,9 +109,16 @@ class DisneyIE(InfoExtractor):
continue
tbr = int_or_none(flavor.get('bitrate'))
if tbr == 99999:
- formats.extend(self._extract_m3u8_formats(
+ # wrong ks(Kaltura Signature) causes 404 Error
+ flavor_url = update_url_query(flavor_url, {'ks': ''})
+ m3u8_formats = self._extract_m3u8_formats(
flavor_url, video_id, 'mp4',
- m3u8_id=flavor_format, fatal=False))
+ m3u8_id=flavor_format, fatal=False)
+ for f in m3u8_formats:
+ # Apple FairPlay
+ if '/fpshls/' in f['url']:
+ continue
+ formats.append(f)
continue
format_id = []
if flavor_format: