projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move FileDownloader to its own module and create a new class for each download process
[youtube-dl]
/
youtube_dl
/
YoutubeDL.py
diff --git
a/youtube_dl/YoutubeDL.py
b/youtube_dl/YoutubeDL.py
index 2dd7e490710eb81ae5300bbfa5ee03cce932040a..414aa5a80cb575642ee4ff20e393c7c96afb4e14 100644
(file)
--- a/
youtube_dl/YoutubeDL.py
+++ b/
youtube_dl/YoutubeDL.py
@@
-3,6
+3,7
@@
from __future__ import absolute_import
from __future__ import absolute_import
+import collections
import errno
import io
import json
import errno
import io
import json
@@
-50,7
+51,7
@@
from .utils import (
YoutubeDLHandler,
)
from .extractor import get_info_extractor, gen_extractors
YoutubeDLHandler,
)
from .extractor import get_info_extractor, gen_extractors
-from .
FileDownloader import FileD
ownloader
+from .
downloader import get_suitable_d
ownloader
from .version import __version__
from .version import __version__
@@
-154,7
+155,7
@@
class YoutubeDL(object):
self._ies = []
self._ies_instances = {}
self._pps = []
self._ies = []
self._ies_instances = {}
self._pps = []
- self._progress_hooks = []
+ self._
fd_
progress_hooks = []
self._download_retcode = 0
self._num_downloads = 0
self._screen_file = [sys.stdout, sys.stderr][params.get('logtostderr', False)]
self._download_retcode = 0
self._num_downloads = 0
self._screen_file = [sys.stdout, sys.stderr][params.get('logtostderr', False)]
@@
-192,8
+193,6
@@
class YoutubeDL(object):
u'Set the LC_ALL environment variable to fix this.')
self.params['restrictfilenames'] = True
u'Set the LC_ALL environment variable to fix this.')
self.params['restrictfilenames'] = True
- self.fd = FileDownloader(self, self.params)
-
if '%(stitle)s' in self.params.get('outtmpl', ''):
self.report_warning(u'%(stitle)s is deprecated. Use the %(title)s and the --restrict-filenames flag(which also secures %(uploader)s et al) instead.')
if '%(stitle)s' in self.params.get('outtmpl', ''):
self.report_warning(u'%(stitle)s is deprecated. Use the %(title)s and the --restrict-filenames flag(which also secures %(uploader)s et al) instead.')
@@
-229,6
+228,10
@@
class YoutubeDL(object):
self._pps.append(pp)
pp.set_downloader(self)
self._pps.append(pp)
pp.set_downloader(self)
+ def add_downloader_progress_hook(self, ph):
+ """Add the progress hook to the file downloader"""
+ self._fd_progress_hooks.append(ph)
+
def _bidi_workaround(self, message):
if not hasattr(self, '_fribidi_channel'):
return message
def _bidi_workaround(self, message):
if not hasattr(self, '_fribidi_channel'):
return message
@@
-396,18
+399,17
@@
class YoutubeDL(object):
template_dict['playlist_index'] = u'%05d' % template_dict['playlist_index']
sanitize = lambda k, v: sanitize_filename(
template_dict['playlist_index'] = u'%05d' % template_dict['playlist_index']
sanitize = lambda k, v: sanitize_filename(
-
u'NA' if v is None else
compat_str(v),
+ compat_str(v),
restricted=self.params.get('restrictfilenames'),
is_id=(k == u'id'))
template_dict = dict((k, sanitize(k, v))
restricted=self.params.get('restrictfilenames'),
is_id=(k == u'id'))
template_dict = dict((k, sanitize(k, v))
- for k, v in template_dict.items())
+ for k, v in template_dict.items()
+ if v is not None)
+ template_dict = collections.defaultdict(lambda: u'NA', template_dict)
tmpl = os.path.expanduser(self.params['outtmpl'])
filename = tmpl % template_dict
return filename
tmpl = os.path.expanduser(self.params['outtmpl'])
filename = tmpl % template_dict
return filename
- except KeyError as err:
- self.report_error(u'Erroneous output template')
- return None
except ValueError as err:
self.report_error(u'Error in output template: ' + str(err) + u' (encoding: ' + repr(preferredencoding()) + ')')
return None
except ValueError as err:
self.report_error(u'Error in output template: ' + str(err) + u' (encoding: ' + repr(preferredencoding()) + ')')
return None
@@
-827,7
+829,7
@@
class YoutubeDL(object):
if self.params.get('writethumbnail', False):
if info_dict.get('thumbnail') is not None:
thumb_format = determine_ext(info_dict['thumbnail'], u'jpg')
if self.params.get('writethumbnail', False):
if info_dict.get('thumbnail') is not None:
thumb_format = determine_ext(info_dict['thumbnail'], u'jpg')
- thumb_filename =
filename.rpartition('.'
)[0] + u'.' + thumb_format
+ thumb_filename =
os.path.splitext(filename
)[0] + u'.' + thumb_format
self.to_screen(u'[%s] %s: Downloading thumbnail ...' %
(info_dict['extractor'], info_dict['id']))
try:
self.to_screen(u'[%s] %s: Downloading thumbnail ...' %
(info_dict['extractor'], info_dict['id']))
try:
@@
-845,7
+847,10
@@
class YoutubeDL(object):
success = True
else:
try:
success = True
else:
try:
- success = self.fd._do_download(filename, info_dict)
+ fd = get_suitable_downloader(info_dict)(self, self.params)
+ for ph in self._fd_progress_hooks:
+ fd.add_progress_hook(ph)
+ success = fd.download(filename, info_dict)
except (compat_urllib_error.URLError, compat_http_client.HTTPException, socket.error) as err:
self.report_error(u'unable to download video data: %s' % str(err))
return
except (compat_urllib_error.URLError, compat_http_client.HTTPException, socket.error) as err:
self.report_error(u'unable to download video data: %s' % str(err))
return