summary refs log tree commit diff
diff options
context:
space:
mode:
authorRemita Amine <remitamine@gmail.com>2019-04-27 10:17:26 +0100
committerRemita Amine <remitamine@gmail.com>2019-04-27 10:17:34 +0100
commit2309d6bf92435e2c9a0a9a3ebca7e15f68651225 (patch)
tree2068e73f659f49c5d097a36adb1af3ff4647c9b0
parent822b9d9cb09429645582791dba31f4cbed7583cf (diff)
downloadyoutube-dl-2309d6bf92435e2c9a0a9a3ebca7e15f68651225.tar.gz
youtube-dl-2309d6bf92435e2c9a0a9a3ebca7e15f68651225.tar.xz
youtube-dl-2309d6bf92435e2c9a0a9a3ebca7e15f68651225.zip
[sixplay] try to extract non drm protected manifests(closes #20849)
-rw-r--r--youtube_dl/extractor/sixplay.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/youtube_dl/extractor/sixplay.py b/youtube_dl/extractor/sixplay.py
index 35bc9fa50..ce21797a7 100644
--- a/youtube_dl/extractor/sixplay.py
+++ b/youtube_dl/extractor/sixplay.py
@@ -65,7 +65,7 @@ class SixPlayIE(InfoExtractor):
         for asset in assets:
             asset_url = asset.get('full_physical_path')
             protocol = asset.get('protocol')
-            if not asset_url or protocol == 'primetime' or asset.get('type') == 'usp_hlsfp_h264' or asset_url in urls:
+            if not asset_url or (protocol == 'primetime' or asset.get('type') == 'usp_hlsfp_h264') and not ('_drmnp.ism/' in asset_url or '_unpnp.ism/' in asset_url) or asset_url in urls:
                 continue
             urls.append(asset_url)
             container = asset.get('video_container')
@@ -82,6 +82,7 @@ class SixPlayIE(InfoExtractor):
                         if not urlh:
                             continue
                         asset_url = urlh.geturl()
+                    asset_url = asset_url.replace('_drmnp.ism/', '_unpnp.ism/')
                     for i in range(3, 0, -1):
                         asset_url = asset_url = asset_url.replace('_sd1/', '_sd%d/' % i)
                         m3u8_formats = self._extract_m3u8_formats(