From ec97a5b11da2d79c6cb4171f653f52d5b2fa0157 Mon Sep 17 00:00:00 2001
From: GwnDaan <thadutchgameryt@gmail.com>
Date: Mon, 7 Nov 2022 12:33:51 +0100
Subject: [PATCH] Display when error occured on update

---
 web_app/server.py          | 1 +
 web_app/static/settings.js | 8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/web_app/server.py b/web_app/server.py
index 0cf09569..97c394da 100755
--- a/web_app/server.py
+++ b/web_app/server.py
@@ -268,6 +268,7 @@ def check_update(source_url = None, current_release = None, prerelease=False, em
              
     except Exception as e:
         print("Check update error: ", e)
+        new_release = { "error" : repr(e)}
         
     if emit:
         socketio.emit("new release", json.dumps(new_release), namespace="/test")
diff --git a/web_app/static/settings.js b/web_app/static/settings.js
index 547ddeec..925af4ef 100644
--- a/web_app/static/settings.js
+++ b/web_app/static/settings.js
@@ -376,8 +376,12 @@ $(document).ready(function () {
     socket.on("new release", function(msg) {
         // open modal box asking for starting update
         response = JSON.parse(msg);
-        console.log(response);
-        if (response.new_release) {
+        console.log(JSON.stringify(response));
+        if (response.error) {
+            $("#updateModal .modal-title").text("Update error!");
+            $("#updateModal .modal-body").append(response['error']);
+            $("#updateModal").modal();
+        }else if (response.new_release) {
             $("#updateModal .modal-title").text("Update available!");
             $("#updateModal .modal-body").append('<p class="text-center">Do you want to install <b>' + response['new_release'] +'</b>? <br>It will take a few minutes.</p>');                    
             var newFeaturesArray = response['comment'].split('\r\n');