Merge branch 'alpha'

texx00 · Sep 18, 2021 · a0e7803 · a0e7803
2 parents bb5968f + 14e6131
commit a0e7803
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/server/sockets_interface/socketio_callbacks.py b/server/sockets_interface/socketio_callbacks.py
@@ -11,7 +11,10 @@
 from server.database.playlist_elements import DrawingElement, GenericPlaylistElement
 from server.database.models import UploadedFiles, Playlists
 
-
+@socketio.on('connect')
+def on_client_connected():
+    app.qmanager.send_queue_status()        # sending queue status
+    settings_request()                      # sending updated settings
 
 # TODO split in multiple files?    
 

diff --git a/server/utils/software_updates.py b/server/utils/software_updates.py
@@ -27,9 +27,12 @@ def compare_local_remote_tags():
     result["remote_latest"] = remote_versions[0]
 
     # Requesting local tag
-    local_tag = subprocess.check_output(['git', 'describe', '--tags', '--abbrev=0'])
-    local_tag = version.parse(local_tag.decode(encoding="UTF-8"))
-    result["local"] = local_tag
+    try:
+        local_tag = subprocess.check_output(['git', 'describe', '--tags', '--abbrev=0'])
+        local_tag = version.parse(local_tag.decode(encoding="UTF-8"))
+        result["local"] = local_tag
+    except:         # this is to handle the subprocess error in github tests
+        result["local"] = result["remote_latest"]
 
     # Comparing outputs
     result["behind_remote"] = result["remote_latest"] > result["local"]