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

[external] Make get_execname() a classmethod per @dstftw

Browse Source
This commit is contained in:
John Hawkinson 2017-03-21 14:21:28 -04:00
parent 095cda627e
commit 66361e1e93
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
youtube_dl/downloader/external.py
View File

@ -51,8 +51,9 @@ class ExternalFD(FileDownloader):
def get_basename(cls): def get_basename(cls):
return cls.__name__[:-2].lower() return cls.__name__[:-2].lower()
def get_execname(self): @classmethod
return self.__class__.get_basename() def get_execname(cls):
return cls.get_basename()
@property @property
def exe(self): def exe(self):
@ -195,19 +196,19 @@ class FFmpegFD(ExternalFD):
def available(cls): def available(cls):
return FFmpegPostProcessor().available return FFmpegPostProcessor().available
@classmethod
def get_execname(self): def get_execname(self):
return self.execname return FFmpegPostProcessor().executable
def _call_downloader(self, tmpfilename, info_dict): def _call_downloader(self, tmpfilename, info_dict):
url = info_dict['url'] url = info_dict['url']
ffpp = FFmpegPostProcessor(downloader=self) ffpp = FFmpegPostProcessor(downloader=self)
self.execname = ffpp.executable
if not ffpp.available: if not ffpp.available:
self.report_error('m3u8 download detected but ffmpeg or avconv could not be found. Please install one.') self.report_error('m3u8 download detected but ffmpeg or avconv could not be found. Please install one.')
return False return False
ffpp.check_version() ffpp.check_version()
args = [self.execname, '-y'] args = [ffpp.executable, '-y']
seekable = info_dict.get('_seekable') seekable = info_dict.get('_seekable')
if seekable is not None: if seekable is not None: