From 881b48729cfdcb381741fb3484ce49d5b88728c0 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Thu, 21 Nov 2024 17:13:20 +0100
Subject: [PATCH] Improved handling of docker database errors

---
 cps/error_handler.py          | 14 ++++++++++++++
 cps/templates/http_error.html |  6 +++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/cps/error_handler.py b/cps/error_handler.py
index 92d3e876..0df98332 100644
--- a/cps/error_handler.py
+++ b/cps/error_handler.py
@@ -37,17 +37,31 @@ def error_http(error):
                            error_code="Error {0}".format(error.code),
                            error_name=error.name,
                            issue=False,
+                           goto_admin=False,
                            unconfigured=not config.db_configured,
                            instance=config.config_calibre_web_title
                            ), error.code
 
 
 def internal_error(error):
+    if (isinstance(error.original_exception, AttributeError) and
+        error.original_exception.args[0] == "'NoneType' object has no attribute 'query'"
+        and error.original_exception.name == "query"):
+        return render_template('http_error.html',
+                               error_code="Database Error",
+                               error_name='The library used is invalid or has permission errors',
+                               issue=False,
+                               goto_admin=True,
+                               unconfigured=False,
+                               error_stack="",
+                               instance=config.config_calibre_web_title
+                               ), 500
     return render_template('http_error.html',
                            error_code="500 Internal Server Error",
                            error_name='The server encountered an internal error and was unable to complete your '
                                       'request. There is an error in the application.',
                            issue=True,
+                           goto_admin=False,
                            unconfigured=False,
                            error_stack=traceback.format_exc().split("\n"),
                            instance=config.config_calibre_web_title
diff --git a/cps/templates/http_error.html b/cps/templates/http_error.html
index 26c3c379..1c3e17a8 100644
--- a/cps/templates/http_error.html
+++ b/cps/templates/http_error.html
@@ -48,7 +48,11 @@
     <div class="row">
       <div class="col errorlink">
       {% if not unconfigured %}
-        <a href="{{url_for('web.index')}}" title="{{ _('Return to Home') }}">{{_('Return to Home')}}</a>
+        {% if goto_admin %}
+           <a href="{{url_for('admin.db_configuration')}}" title="{{ _('Return to Database config') }}">{{_('Return to Database config')}}</a>
+        {%  else %}
+           <a href="{{url_for('web.index')}}" title="{{ _('Return to Home') }}">{{_('Return to Home')}}</a>
+        {% endif %}
       {% else %}
         <a href="{{url_for('web.logout')}}" title="{{ _('Logout User') }}">{{ _('Logout User') }}</a>
       {% endif %}