Start new release.

[youtubedl] / youtube_dl / downloader / hls.py

diff --git a/youtube_dl/downloader/hls.py b/youtube_dl/downloader/hls.py
index 0e29c8a2ad2559737d8c0210e9c6784310616ec6..4dc3ab46aa534132862ef0c29c34c871996ea2e4 100644 (file)
--- a/youtube_dl/downloader/hls.py
+++ b/youtube_dl/downloader/hls.py
@@ -59,9 +59,9 @@ class HlsFD(FragmentFD):
         man_url = info_dict['url']
         self.to_screen('[%s] Downloading m3u8 manifest' % self.FD_NAME)
 
         man_url = info_dict['url']
         self.to_screen('[%s] Downloading m3u8 manifest' % self.FD_NAME)
 

-        manifest = self.ydl.urlopen(self._prepare_url(info_dict, man_url)).read()
-
-        s = manifest.decode('utf-8', 'ignore')
+        urlh = self.ydl.urlopen(self._prepare_url(info_dict, man_url))
+        man_url = urlh.geturl()
+        s = urlh.read().decode('utf-8', 'ignore')

 
         if not self.can_download(s, info_dict):
             if info_dict.get('extra_param_to_segment_url'):
 
         if not self.can_download(s, info_dict):
             if info_dict.get('extra_param_to_segment_url'):


@@ -75,15 +75,30 @@ class HlsFD(FragmentFD):
                 fd.add_progress_hook(ph)
             return fd.real_download(filename, info_dict)
 
                 fd.add_progress_hook(ph)
             return fd.real_download(filename, info_dict)
 

-        total_frags = 0
+        def anvato_ad(s):
+            return s.startswith('#ANVATO-SEGMENT-INFO') and 'type=ad' in s
+
+        media_frags = 0
+        ad_frags = 0
+        ad_frag_next = False

         for line in s.splitlines():
             line = line.strip()
         for line in s.splitlines():
             line = line.strip()

-            if line and not line.startswith('#'):
-                total_frags += 1
+            if not line:
+                continue
+            if line.startswith('#'):
+                if anvato_ad(line):
+                    ad_frags += 1
+                    ad_frag_next = True
+                continue
+            if ad_frag_next:
+                ad_frag_next = False
+                continue
+            media_frags += 1

 
         ctx = {
             'filename': filename,
 
         ctx = {
             'filename': filename,

-            'total_frags': total_frags,
+            'total_frags': media_frags,
+            'ad_frags': ad_frags,

         }
 
         self._prepare_and_start_frag_download(ctx)
         }
 
         self._prepare_and_start_frag_download(ctx)


@@ -101,10 +116,14 @@ class HlsFD(FragmentFD):
         decrypt_info = {'METHOD': 'NONE'}
         byte_range = {}
         frag_index = 0
         decrypt_info = {'METHOD': 'NONE'}
         byte_range = {}
         frag_index = 0

+        ad_frag_next = False

         for line in s.splitlines():
             line = line.strip()
             if line:
                 if not line.startswith('#'):
         for line in s.splitlines():
             line = line.strip()
             if line:
                 if not line.startswith('#'):

+                    if ad_frag_next:
+                        ad_frag_next = False
+                        continue

                     frag_index += 1
                     if frag_index <= ctx['fragment_index']:
                         continue
                     frag_index += 1
                     if frag_index <= ctx['fragment_index']:
                         continue


@@ -144,7 +163,8 @@ class HlsFD(FragmentFD):
                         return False
                     if decrypt_info['METHOD'] == 'AES-128':
                         iv = decrypt_info.get('IV') or compat_struct_pack('>8xq', media_sequence)
                         return False
                     if decrypt_info['METHOD'] == 'AES-128':
                         iv = decrypt_info.get('IV') or compat_struct_pack('>8xq', media_sequence)

-                        decrypt_info['KEY'] = decrypt_info.get('KEY') or self.ydl.urlopen(decrypt_info['URI']).read()
+                        decrypt_info['KEY'] = decrypt_info.get('KEY') or self.ydl.urlopen(
+                            self._prepare_url(info_dict, decrypt_info['URI'])).read()

                         frag_content = AES.new(
                             decrypt_info['KEY'], AES.MODE_CBC, iv).decrypt(frag_content)
                     self._append_fragment(ctx, frag_content)
                         frag_content = AES.new(
                             decrypt_info['KEY'], AES.MODE_CBC, iv).decrypt(frag_content)
                     self._append_fragment(ctx, frag_content)


@@ -175,6 +195,8 @@ class HlsFD(FragmentFD):
                         'start': sub_range_start,
                         'end': sub_range_start + int(splitted_byte_range[0]),
                     }
                         'start': sub_range_start,
                         'end': sub_range_start + int(splitted_byte_range[0]),
                     }

+                elif anvato_ad(line):
+                    ad_frag_next = True

 
         self._finish_frag_download(ctx)
 
 
         self._finish_frag_download(ctx)