]> gitweb @ CieloNegro.org - youtube-dl.git/commitdiff
[sixplay] try to extract non drm protected manifests(closes #20849)
authorRemita Amine <remitamine@gmail.com>
Sat, 27 Apr 2019 09:17:26 +0000 (10:17 +0100)
committerRemita Amine <remitamine@gmail.com>
Sat, 27 Apr 2019 09:17:34 +0000 (10:17 +0100)
youtube_dl/extractor/sixplay.py

index 35bc9fa5017ca755c2e1f3244af074fb891b99cb..ce21797a71cd0ddba2f6b140c8e9de51d2929ae9 100644 (file)
@@ -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(