mirror of
https://github.com/janeczku/calibre-web
synced 2024-12-25 09:30:31 +00:00
Fiexes from tests
This commit is contained in:
parent
b75497231e
commit
a48418364c
16
cps/admin.py
16
cps/admin.py
@ -544,13 +544,13 @@ def _configuration_logfile_helper(to_save, gdriveError):
|
|||||||
reboot_required |= _config_int(to_save, "config_log_level")
|
reboot_required |= _config_int(to_save, "config_log_level")
|
||||||
reboot_required |= _config_string(to_save, "config_logfile")
|
reboot_required |= _config_string(to_save, "config_logfile")
|
||||||
if not logger.is_valid_logfile(config.config_logfile):
|
if not logger.is_valid_logfile(config.config_logfile):
|
||||||
return _configuration_result(_('Logfile Location is not Valid, Please Enter Correct Path'), gdriveError)
|
return reboot_required, _configuration_result(_('Logfile Location is not Valid, Please Enter Correct Path'), gdriveError)
|
||||||
|
|
||||||
reboot_required |= _config_checkbox_int(to_save, "config_access_log")
|
reboot_required |= _config_checkbox_int(to_save, "config_access_log")
|
||||||
reboot_required |= _config_string(to_save, "config_access_logfile")
|
reboot_required |= _config_string(to_save, "config_access_logfile")
|
||||||
if not logger.is_valid_logfile(config.config_access_logfile):
|
if not logger.is_valid_logfile(config.config_access_logfile):
|
||||||
return _configuration_result(_('Access Logfile Location is not Valid, Please Enter Correct Path'), gdriveError)
|
return reboot_required, _configuration_result(_('Access Logfile Location is not Valid, Please Enter Correct Path'), gdriveError)
|
||||||
return reboot_required
|
return reboot_required, None
|
||||||
|
|
||||||
def _configuration_ldap_helper(gdriveError, to_save):
|
def _configuration_ldap_helper(gdriveError, to_save):
|
||||||
reboot_required = False
|
reboot_required = False
|
||||||
@ -646,7 +646,10 @@ def _configuration_update_helper():
|
|||||||
|
|
||||||
#LDAP configurator,
|
#LDAP configurator,
|
||||||
if config.config_login_type == constants.LOGIN_LDAP:
|
if config.config_login_type == constants.LOGIN_LDAP:
|
||||||
reboot_required |= _configuration_ldap_helper(to_save, gdriveError)
|
reboot, message = _configuration_ldap_helper(to_save, gdriveError)
|
||||||
|
if message:
|
||||||
|
return message
|
||||||
|
reboot_required |= reboot
|
||||||
|
|
||||||
# Remote login configuration
|
# Remote login configuration
|
||||||
_config_checkbox(to_save, "config_remote_login")
|
_config_checkbox(to_save, "config_remote_login")
|
||||||
@ -672,7 +675,10 @@ def _configuration_update_helper():
|
|||||||
if config.config_login_type == constants.LOGIN_OAUTH:
|
if config.config_login_type == constants.LOGIN_OAUTH:
|
||||||
_configuration_oauth_helper(to_save)
|
_configuration_oauth_helper(to_save)
|
||||||
|
|
||||||
reboot_required |= _configuration_logfile_helper(to_save, gdriveError)
|
reboot, message = _configuration_logfile_helper(to_save, gdriveError)
|
||||||
|
if message:
|
||||||
|
return message
|
||||||
|
reboot_required |= reboot
|
||||||
# Rarfile Content configuration
|
# Rarfile Content configuration
|
||||||
_config_string(to_save, "config_rarfile_location")
|
_config_string(to_save, "config_rarfile_location")
|
||||||
unrar_status = helper.check_unrar(config.config_rarfile_location)
|
unrar_status = helper.check_unrar(config.config_rarfile_location)
|
||||||
|
@ -367,7 +367,11 @@ def feed_shelf(book_id):
|
|||||||
@requires_basic_auth_if_no_ano
|
@requires_basic_auth_if_no_ano
|
||||||
@download_required
|
@download_required
|
||||||
def opds_download_link(book_id, book_format):
|
def opds_download_link(book_id, book_format):
|
||||||
return get_download_link(book_id, book_format.lower())
|
if "Kobo" in request.headers.get('User-Agent'):
|
||||||
|
client = "kobo"
|
||||||
|
else:
|
||||||
|
client = ""
|
||||||
|
return get_download_link(book_id, book_format.lower(), client)
|
||||||
|
|
||||||
|
|
||||||
@opds.route("/ajax/book/<string:uuid>/<library>")
|
@opds.route("/ajax/book/<string:uuid>/<library>")
|
||||||
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user