NunoSempere/calibre-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Code cosmetics

Browse Source
This commit is contained in:
Ozzie Isaacs 2024-05-10 10:41:04 +02:00
parent 60ed1904f5
commit 2c37546598
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cps/config_sql.py
View File

@ -491,8 +491,10 @@ def autodetect_calibre_binaries():
else: else:
calibre_path = ["/opt/calibre/"] calibre_path = ["/opt/calibre/"]
for element in calibre_path: for element in calibre_path:
supported_binary_paths = [os.path.join(element, binary) for binary in constants.SUPPORTED_CALIBRE_BINARIES.values()] supported_binary_paths = [os.path.join(element, binary)
if all(os.path.isfile(binary_path) and os.access(binary_path, os.X_OK) for binary_path in supported_binary_paths): for binary in constants.SUPPORTED_CALIBRE_BINARIES.values()]
if all(os.path.isfile(binary_path) and os.access(binary_path, os.X_OK)
for binary_path in supported_binary_paths):
values = [process_wait([binary_path, "--version"], values = [process_wait([binary_path, "--version"],
pattern=r'\(calibre (.*)\)') for binary_path in supported_binary_paths] pattern=r'\(calibre (.*)\)') for binary_path in supported_binary_paths]
if all(values): if all(values):