Akkariin/youtube-dl
1
0
Fork 0
mirror of https://github.com/l1ving/youtube-dl synced 2025-03-13 02:22:14 +08:00
Code Issues Releases Wiki Activity

[external] Print executable name instead of classname

Browse Source 
Seperate out the concept of the executable used by an ExternalFD
downloader and the name of the class. I'm not entirely sure why we
care aobut the name of the class at all, but it's used outside of
classes to initialize _BY_NAME() and soforth, so it seems impractical
to just change get_basename() to return the executable name

So instead, call get_execname() not get_basename().

Default get_execname() to calling get_basename(), but override it in
FFmpegFD, where it returns self.execname, which is set in
_call_downloader().

Perhaps there is a less complicated way to achieve this goal?
This commit is contained in:
John Hawkinson 2017-03-20 11:04:37 -04:00
parent 97952bdb78
commit 095cda627e
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
youtube_dl/downloader/external.py
View File

@ -32,7 +32,7 @@ class ExternalFD(FileDownloader):
retval = self._call_downloader(tmpfilename, info_dict)
if retval == 0:
fsize = os.path.getsize(encodeFilename(tmpfilename))
self.to_screen('\r[%s] Downloaded %s bytes' % (self.get_basename(), fsize))
self.to_screen('\r[%s] Downloaded %s bytes' % (self.get_execname(), fsize))
self.try_rename(tmpfilename, filename)
self._hook_progress({
'downloaded_bytes': fsize,
@ -44,13 +44,16 @@ class ExternalFD(FileDownloader):
else:
self.to_stderr('\n')
self.report_error('%s exited with code %d' % (
self.get_basename(), retval))
self.get_execname(), retval))
return False
@classmethod
def get_basename(cls):
return cls.__name__[:-2].lower()
def get_execname(self):
return self.__class__.get_basename()
@property
def exe(self):
return self.params.get('external_downloader')
@ -192,15 +195,19 @@ class FFmpegFD(ExternalFD):
def available(cls):
return FFmpegPostProcessor().available
def get_execname(self):
return self.execname
def _call_downloader(self, tmpfilename, info_dict):
url = info_dict['url']
ffpp = FFmpegPostProcessor(downloader=self)
self.execname = ffpp.executable
if not ffpp.available:
self.report_error('m3u8 download detected but ffmpeg or avconv could not be found. Please install one.')
return False
ffpp.check_version()
args = [ffpp.executable, '-y']
args = [self.execname, '-y']
seekable = info_dict.get('_seekable')
if seekable is not None:
@ -237,7 +244,7 @@ class FFmpegFD(ExternalFD):
if proxy.startswith('socks'):
self.report_warning(
'%s does not support SOCKS proxies. Downloading is likely to fail. '
'Consider adding --hls-prefer-native to your command.' % self.get_basename())
'Consider adding --hls-prefer-native to your command.' % self.get_execname())
# Since December 2015 ffmpeg supports -http_proxy option (see
# http://git.videolan.org/?p=ffmpeg.git;a=commit;h=b4eb1f29ebddd60c41a2eb39f5af701e38e0d3fd)