From 964bd44649aaf03c9afea06eadad0443032d8b77 Mon Sep 17 00:00:00 2001
From: Wojtek Kosior <koszko@koszko.org>
Date: Tue, 23 Aug 2022 14:28:38 +0200
Subject: inform the web UI user about errors in communication with repository

---
 src/hydrilla/proxy/web_ui/repos.py                         | 14 +++++++++-----
 .../proxy/web_ui/templates/repos/show_single.html.jinja    | 10 ++++++++++
 2 files changed, 19 insertions(+), 5 deletions(-)

(limited to 'src/hydrilla/proxy/web_ui')

diff --git a/src/hydrilla/proxy/web_ui/repos.py b/src/hydrilla/proxy/web_ui/repos.py
index 8c69028..ae4741f 100644
--- a/src/hydrilla/proxy/web_ui/repos.py
+++ b/src/hydrilla/proxy/web_ui/repos.py
@@ -98,17 +98,17 @@ def show_repo(repo_id: str, errors: t.Mapping[str, bool] = {}) \
 
 @bp.route('/repos/view/<string:repo_id>', methods=['POST'])
 def alter_repo(repo_id: str) -> werkzeug.Response:
+    form_data = flask.request.form
+    action = form_data['action']
+
     repo_id = str(int(repo_id))
     if repo_id == '1':
         # Protect local semi-repo.
         flask.abort(403)
 
-    repo_ref = _app.get_haketilo_state().repo_store().get(repo_id)
-
-    form_data = flask.request.form
-    action = form_data['action']
-
     try:
+        repo_ref = _app.get_haketilo_state().repo_store().get(repo_id)
+
         if action == 'remove_repo':
             repo_ref.remove()
             return flask.redirect(flask.url_for('.repos'))
@@ -127,6 +127,10 @@ def alter_repo(repo_id: str) -> werkzeug.Response:
         return show_repo(repo_id, {'repo_name_taken': True})
     except st.RepoUrlInvalid:
         return show_repo(repo_id, {'repo_url_invalid': True})
+    except st.RepoCommunicationError:
+        return show_repo(repo_id, {'repo_communication_error': True})
+    except st.RepoApiVersionUnsupported:
+        return show_repo(repo_id, {'repo_api_version_unsupported': True})
     except st.MissingItemError:
         flask.abort(404)
 
diff --git a/src/hydrilla/proxy/web_ui/templates/repos/show_single.html.jinja b/src/hydrilla/proxy/web_ui/templates/repos/show_single.html.jinja
index 5783a20..b3a4f32 100644
--- a/src/hydrilla/proxy/web_ui/templates/repos/show_single.html.jinja
+++ b/src/hydrilla/proxy/web_ui/templates/repos/show_single.html.jinja
@@ -27,6 +27,16 @@ in a proprietary work, I am not going to enforce this in court.
   {% include 'include/checkbox_tricks_style.css.jinja' %}
 {% endblock %}
 {% block main %}
+  {%- if repo_communication_error is defined %}
+    <aside class="error-note">
+      {{ _('web_ui.repos.add.repo_communication_error') }}
+    </aside>
+  {%- endif %}
+  {%- if repo_api_version_unsupported is defined %}
+    <aside class="error-note">
+      {{ _('web_ui.repos.add.repo_api_version_unsupported') }}
+    </aside>
+  {%- endif %}
   {%- set repo_id = display_info.ref.id %}
   {%- if display_info.is_local_semirepo %}
     <h3>{{ _('web_ui.repos.local_packages_semirepo') }}</h3>
-- 
cgit v1.2.3