Madiator2011/lbry-sdk
1
0
Fork 0
forked from LBRYCommunity/lbry-sdk
Code Pull requests Activity

dont recheck ffmpeg installation in status

Browse source
This commit is contained in:
Jack Robison 2020-03-27 11:54:00 -04:00 • committed by Lex Berezhny
parent c8f431447c
commit 25ba5b867c
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lbry/extras/daemon/daemon.py
View file

@ -785,7 +785,7 @@ class Daemon(metaclass=JSONRPCServerType):
'analyze_audio_volume': (bool) should ffmpeg analyze audio 'analyze_audio_volume': (bool) should ffmpeg analyze audio
} }
""" """
return await self._video_file_analyzer.status(reset=True) return await self._video_file_analyzer.status(reset=True, recheck=True)
async def jsonrpc_status(self): async def jsonrpc_status(self):
""" """

8
lbry/file_analysis.py
View file

@ -30,6 +30,7 @@ class VideoFileAnalyzer:
self._which_ffmpeg = None self._which_ffmpeg = None
self._which_ffprobe = None self._which_ffprobe = None
self._env_copy = dict(os.environ) self._env_copy = dict(os.environ)
self._checked_ffmpeg = False
if lbry.utils.is_running_from_bundle(): if lbry.utils.is_running_from_bundle():
# handle the situation where PyInstaller overrides our runtime environment: # handle the situation where PyInstaller overrides our runtime environment:
self._replace_or_pop_env('LD_LIBRARY_PATH') self._replace_or_pop_env('LD_LIBRARY_PATH')
@ -94,15 +95,18 @@ class VideoFileAnalyzer:
await self._verify_executables() await self._verify_executables()
self._ffmpeg_installed = True self._ffmpeg_installed = True
async def status(self, reset=False): async def status(self, reset=False, recheck=False):
if reset: if reset:
self._available_encoders = "" self._available_encoders = ""
self._ffmpeg_installed = None self._ffmpeg_installed = None
if self._ffmpeg_installed is None: if self._checked_ffmpeg and not recheck:
pass
elif self._ffmpeg_installed is None:
try: try:
await self._verify_ffmpeg_installed() await self._verify_ffmpeg_installed()
except FileNotFoundError: except FileNotFoundError:
pass pass
self._checked_ffmpeg = True
return { return {
"available": self._ffmpeg_installed, "available": self._ffmpeg_installed,
"which": self._which_ffmpeg, "which": self._which_ffmpeg,