diff options
Diffstat (limited to 'youtube_dlc/downloader/dash.py')
| -rw-r--r-- | youtube_dlc/downloader/dash.py | 37 |
1 files changed, 30 insertions, 7 deletions
diff --git a/youtube_dlc/downloader/dash.py b/youtube_dlc/downloader/dash.py index c6d674bc6..d758282c1 100644 --- a/youtube_dlc/downloader/dash.py +++ b/youtube_dlc/downloader/dash.py @@ -1,6 +1,8 @@ from __future__ import unicode_literals +from ..downloader import _get_real_downloader from .fragment import FragmentFD + from ..compat import compat_urllib_error from ..utils import ( DownloadError, @@ -20,31 +22,42 @@ class DashSegmentsFD(FragmentFD): fragments = info_dict['fragments'][:1] if self.params.get( 'test', False) else info_dict['fragments'] + real_downloader = _get_real_downloader(info_dict, 'frag_urls', self.params, None) + ctx = { 'filename': filename, 'total_frags': len(fragments), } - self._prepare_and_start_frag_download(ctx) + if real_downloader: + self._prepare_external_frag_download(ctx) + else: + self._prepare_and_start_frag_download(ctx) fragment_retries = self.params.get('fragment_retries', 0) skip_unavailable_fragments = self.params.get('skip_unavailable_fragments', True) + fragment_urls = [] frag_index = 0 for i, fragment in enumerate(fragments): frag_index += 1 if frag_index <= ctx['fragment_index']: continue + fragment_url = fragment.get('url') + if not fragment_url: + assert fragment_base_url + fragment_url = urljoin(fragment_base_url, fragment['path']) + + if real_downloader: + fragment_urls.append(fragment_url) + continue + # In DASH, the first segment contains necessary headers to # generate a valid MP4 file, so always abort for the first segment fatal = i == 0 or not skip_unavailable_fragments count = 0 while count <= fragment_retries: try: - fragment_url = fragment.get('url') - if not fragment_url: - assert fragment_base_url - fragment_url = urljoin(fragment_base_url, fragment['path']) success, frag_content = self._download_fragment(ctx, fragment_url, info_dict) if not success: return False @@ -75,6 +88,16 @@ class DashSegmentsFD(FragmentFD): self.report_error('giving up after %s fragment retries' % fragment_retries) return False - self._finish_frag_download(ctx) - + if real_downloader: + info_copy = info_dict.copy() + info_copy['url_list'] = fragment_urls + fd = real_downloader(self.ydl, self.params) + # TODO: Make progress updates work without hooking twice + # for ph in self._progress_hooks: + # fd.add_progress_hook(ph) + success = fd.real_download(filename, info_copy) + if not success: + return False + else: + self._finish_frag_download(ctx) return True |