debian/control: Remove mplayer2 from recommends. (Closes: #841187)

[youtubedl] / youtube_dl / downloader / dash.py

diff --git a/youtube_dl/downloader/dash.py b/youtube_dl/downloader/dash.py
index 8bbab9dbc596c659db622fe9910d0ae90018a598..8437dde30ca2afe031afb1ff2882ed12ac4b49b5 100644 (file)
--- a/youtube_dl/downloader/dash.py
+++ b/youtube_dl/downloader/dash.py
@@ -1,7 +1,6 @@
 from __future__ import unicode_literals
 
 import os
 from __future__ import unicode_literals
 
 import os

-import re

 
 from .fragment import FragmentFD
 from ..compat import compat_urllib_error
 
 from .fragment import FragmentFD
 from ..compat import compat_urllib_error


@@ -19,32 +18,32 @@ class DashSegmentsFD(FragmentFD):
     FD_NAME = 'dashsegments'
 
     def real_download(self, filename, info_dict):
     FD_NAME = 'dashsegments'
 
     def real_download(self, filename, info_dict):

-        base_url = info_dict['url']
-        segment_urls = [info_dict['segment_urls'][0]] if self.params.get('test', False) else info_dict['segment_urls']
-        initialization_url = info_dict.get('initialization_url')
+        segments = info_dict['fragments'][:1] if self.params.get(
+            'test', False) else info_dict['fragments']

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

-            'total_frags': len(segment_urls) + (1 if initialization_url else 0),
+            'total_frags': len(segments),

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

-        def combine_url(base_url, target_url):
-            if re.match(r'^https?://', target_url):
-                return target_url
-            return '%s%s%s' % (base_url, '' if base_url.endswith('/') else '/', target_url)
-

         segments_filenames = []
 
         fragment_retries = self.params.get('fragment_retries', 0)
         segments_filenames = []
 
         fragment_retries = self.params.get('fragment_retries', 0)

+        skip_unavailable_fragments = self.params.get('skip_unavailable_fragments', True)

 
 

-        def append_url_to_file(target_url, tmp_filename, segment_name):
+        def process_segment(segment, tmp_filename, num):
+            segment_url = segment['url']
+            segment_name = 'Frag%d' % num

             target_filename = '%s-%s' % (tmp_filename, segment_name)
             target_filename = '%s-%s' % (tmp_filename, segment_name)

+            # In DASH, the first segment contains necessary headers to
+            # generate a valid MP4 file, so always abort for the first segment
+            fatal = num == 0 or not skip_unavailable_fragments

             count = 0
             while count <= fragment_retries:
                 try:
             count = 0
             while count <= fragment_retries:
                 try:

-                    success = ctx['dl'].download(target_filename, {'url': combine_url(base_url, target_url)})
+                    success = ctx['dl'].download(target_filename, {'url': segment_url})

                     if not success:
                         return False
                     down, target_sanitized = sanitize_open(target_filename, 'rb')
                     if not success:
                         return False
                     down, target_sanitized = sanitize_open(target_filename, 'rb')


@@ -52,26 +51,27 @@ class DashSegmentsFD(FragmentFD):
                     down.close()
                     segments_filenames.append(target_sanitized)
                     break
                     down.close()
                     segments_filenames.append(target_sanitized)
                     break

-                except (compat_urllib_error.HTTPError, ) as err:
+                except compat_urllib_error.HTTPError as err:

                     # YouTube may often return 404 HTTP error for a fragment causing the
                     # whole download to fail. However if the same fragment is immediately
                     # retried with the same request data this usually succeeds (1-2 attemps
                     # is usually enough) thus allowing to download the whole file successfully.
                     # YouTube may often return 404 HTTP error for a fragment causing the
                     # whole download to fail. However if the same fragment is immediately
                     # retried with the same request data this usually succeeds (1-2 attemps
                     # is usually enough) thus allowing to download the whole file successfully.

-                    # So, we will retry all fragments that fail with 404 HTTP error for now.
-                    if err.code != 404:
-                        raise
-                    # Retry fragment
+                    # To be future-proof we will retry all fragments that fail with any
+                    # HTTP error.

                     count += 1
                     if count <= fragment_retries:
                     count += 1
                     if count <= fragment_retries:

-                        self.report_retry_fragment(segment_name, count, fragment_retries)
+                        self.report_retry_fragment(err, segment_name, count, fragment_retries)

             if count > fragment_retries:
             if count > fragment_retries:

+                if not fatal:
+                    self.report_skip_fragment(segment_name)
+                    return True

                 self.report_error('giving up after %s fragment retries' % fragment_retries)
                 return False
                 self.report_error('giving up after %s fragment retries' % fragment_retries)
                 return False

+            return True

 
 

-        if initialization_url:
-            append_url_to_file(initialization_url, ctx['tmpfilename'], 'Init')
-        for i, segment_url in enumerate(segment_urls):
-            append_url_to_file(segment_url, ctx['tmpfilename'], 'Seg%d' % i)
+        for i, segment in enumerate(segments):
+            if not process_segment(segment, ctx['tmpfilename'], i):
+                return False

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