moved get_calibre_binarypath() to helper.py

This commit is contained in:
Thore Schillmann
2022-07-07 11:41:51 +00:00
parent 0d34f41a48
commit fc004f4f0c
5 changed files with 20 additions and 19 deletions
+2 -3
View File
@@ -43,7 +43,7 @@ from . import constants, logger, helper, services, cli_param
from . import db, calibre_db, ub, web_server, config, updater_thread, gdriveutils, \
kobo_sync_status, schedule
from .helper import check_valid_domain, send_test_mail, reset_password, generate_password_hash, check_email, \
valid_email, check_username
valid_email, check_username, get_calibre_binarypath
from .gdriveutils import is_gdrive_ready, gdrive_support
from .render_template import render_title_template, get_sidebar_config
from .services.worker import WorkerThread
@@ -1727,8 +1727,7 @@ def _configuration_update_helper():
calibre_status = helper.check_calibre(config.config_binariesdir)
if calibre_status:
return _configuration_result(calibre_status)
# ToDo: Remove this and 'self.config_converterpath' and replace with 'config.get_calibre_binarypath("ebook-convert")' everywhere
to_save["config_converterpath"] = config.get_calibre_binarypath("ebook-convert")
to_save["config_converterpath"] = get_calibre_binarypath("ebook-convert")
_config_string(to_save, "config_converterpath")
reboot_required |= _config_int(to_save, "config_login_type")