From e5c2e8026fba9b0a0ea555fd54667a290655da11 Mon Sep 17 00:00:00 2001
From: Halali <moravlvk@gmail.com>
Date: Mon, 18 Feb 2019 12:44:33 +0100
Subject: [PATCH] Continue developing

---
 bazarr/check_update.py |  4 ++--
 bazarr/main.py         | 20 ++++++++++++++++++++
 bazarr/queueconfig.py  |  2 ++
 views/menu.tpl         | 29 ++++++++++++++++++++++++-----
 4 files changed, 48 insertions(+), 7 deletions(-)

diff --git a/bazarr/check_update.py b/bazarr/check_update.py
index 5255c5e6a..38bcd28cb 100644
--- a/bazarr/check_update.py
+++ b/bazarr/check_update.py
@@ -12,7 +12,7 @@ import json
 
 from get_args import args
 from config import settings, bazarr_url
-from queueconfig import q4ws
+from queueconfig import q4ws, q4ws_updater
 
 
 def check_releases():
@@ -137,7 +137,7 @@ def check_updates():
         update()
     
     elif commits_behind == 0:
-        q4ws.append('BAZZAR is up to date')
+        q4ws_updater.append('BAZZAR is up to date')
         logging.info('BAZZAR is up to date')
     
     return latest_version
diff --git a/bazarr/main.py b/bazarr/main.py
index 7ee3959ae..ac7bc0c8d 100644
--- a/bazarr/main.py
+++ b/bazarr/main.py
@@ -1886,6 +1886,26 @@ def handle_websocket():
             break
 
 
+@route(base_url + 'websocket_updater')
+@custom_auth_basic(check_credentials)
+def handle_websocket():
+    wsock = request.environ.get('wsgi.websocket')
+    if not wsock:
+        abort(400, 'Expected WebSocket request.')
+    
+    queueconfig.q4ws_updater.clear()
+    
+    while True:
+        try:
+            if queueconfig.q4ws_updater:
+                wsock.send(queueconfig.q4ws_updater.popleft())
+                gevent.sleep(0.1)
+            else:
+                gevent.sleep(0.5)
+        except WebSocketError:
+            break
+
+
 # Mute DeprecationWarning
 warnings.simplefilter("ignore", DeprecationWarning)
 server = WSGIServer((str(settings.general.ip), (int(args.port) if args.port else int(settings.general.port))), app, handler_class=WebSocketHandler)
diff --git a/bazarr/queueconfig.py b/bazarr/queueconfig.py
index 6795fc125..6d903d7a6 100644
--- a/bazarr/queueconfig.py
+++ b/bazarr/queueconfig.py
@@ -1,4 +1,6 @@
 from collections import deque
 
 global q4ws
+global q4ws_updater
 q4ws = deque(maxlen=10)
+q4ws_updater = deque(maxlen=2)
diff --git a/views/menu.tpl b/views/menu.tpl
index 3b9cdedcf..6b750e50d 100644
--- a/views/menu.tpl
+++ b/views/menu.tpl
@@ -225,14 +225,32 @@
 	if (location.protocol != 'https:')
 	{
 		var ws = new WebSocket("ws://" + window.location.host + "{{base_url}}websocket");
+        var wsupdater = new WebSocket("ws://" + window.location.host + "{{base_url}}websocket_updater");
 	} else {
 		var ws = new WebSocket("wss://" + window.location.host + "{{base_url}}websocket");
+        var wsupdater = new WebSocket("wss://" + window.location.host + "{{base_url}}websocket_updater");
 	}
 
     ws.onmessage = function (evt) {
         new Noty({
-			text: evt.data,
-			timeout: 3000,
+            text: evt.data,
+            timeout: 3000,
+            progressBar: false,
+            animation: {
+                open: null,
+                close: null
+            },
+            killer: true,
+            type: 'info',
+            layout: 'bottomRight',
+            theme: 'semanticui'
+        }).show();
+    };
+
+    wsupdater.onmessage = function (evt) {
+        new Noty({
+            text: evt.data,
+            timeout: false,
 			progressBar: false,
 			animation: {
 				open: null,
@@ -240,8 +258,9 @@
 			},
 			killer: true,
     		type: 'info',
-			layout: 'bottomRight',
-			theme: 'semanticui'
+            layout: 'bottomLeft',
+            theme: 'semanticui',
+            visibilityControl: true
 		}).show();
     };
-</script>
\ No newline at end of file
+</script>