about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRemita Amine <remitamine@gmail.com>2017-12-15 09:27:56 +0100
committerRemita Amine <remitamine@gmail.com>2017-12-15 09:28:07 +0100
commitd05ba4b89e195ed18e8d51561649712f945769b9 (patch)
tree769a35c1d763c0ddf0c5b74ccb1e4ee74c0c1441
parent23f511f5c74d85222e69259996666b7ef97b9421 (diff)
downloadyoutube-dl-d05ba4b89e195ed18e8d51561649712f945769b9.tar.gz
youtube-dl-d05ba4b89e195ed18e8d51561649712f945769b9.tar.xz
youtube-dl-d05ba4b89e195ed18e8d51561649712f945769b9.zip
[disney] skip Apple FairPlay formats(#14982)
-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 968c4c7fd..0eee82fd6 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: