diff --git a/app/cfg/settings.yaml b/app/cfg/settings.yaml index 7e73cbc..c6b507f 100644 --- a/app/cfg/settings.yaml +++ b/app/cfg/settings.yaml @@ -3,10 +3,10 @@ log_level: DEBUG log_rotation: time path_file: "media_path.yaml" server_ip: "0.0.0.0" -extern_http_url: localhost +extern_http_url: localhost:8080 webserver_port: 8080 webserver_https: 0 -extern_websocket_url: localhost +extern_websocket_url: localhost:8000 websocket_port: 8000 websocket_https: 0 task_max: 1 diff --git a/app/main_server.py b/app/main_server.py index 2c3c835..c0755c8 100755 --- a/app/main_server.py +++ b/app/main_server.py @@ -51,6 +51,7 @@ class Server: if data.get("data_path"): self.obj_path.receive_paths(data.get("data_path")) + await self.send_websocket(self.obj_path.queue_path_to_dict()) if var_convert_active == False and self.yaml['autostart']: await self.obj_convert.snake_waiting() diff --git a/client/media_conversion.js b/client/media_conversion.js index e1c4ac8..acb6a10 100755 --- a/client/media_conversion.js +++ b/client/media_conversion.js @@ -103,8 +103,8 @@ function createVideoElement(packet){ function createWaitingSnake(packet){ const queue = document.getElementById('queue'); - Object.keys(packet.data_convert).forEach(key => { - const video = packet.data_convert[key]; + Object.keys(packet.data_queue).forEach(key => { + const video = packet.data_queue[key]; if(!videoActive[key]){ const card = document.createElement('div');