From 87ed7066d7e88615bd4a1c9de7085f9ab9403ae1 Mon Sep 17 00:00:00 2001
From: videogame hacker <half-kh-hacker@hackery.site>
Date: Thu, 6 Jul 2023 21:50:11 +0000
Subject: [PATCH] Fix everything :D

---
 src/demucs_server/routes.py              |  2 +-
 src/demucs_server/templates/task.html.j2 | 35 ++++++++++++++----------
 src/run.sh                               |  2 +-
 3 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/src/demucs_server/routes.py b/src/demucs_server/routes.py
index 16ba183..93847ff 100644
--- a/src/demucs_server/routes.py
+++ b/src/demucs_server/routes.py
@@ -159,7 +159,7 @@ def sse():
             if message.get("task") != task_id:
                 continue
             message = json.dumps(message)
-            yield f"{message}\n\n"
+            yield f"data:{message}\n\n"
 
     return Response(
         stream(),
diff --git a/src/demucs_server/templates/task.html.j2 b/src/demucs_server/templates/task.html.j2
index 3e2a53a..88d6e35 100644
--- a/src/demucs_server/templates/task.html.j2
+++ b/src/demucs_server/templates/task.html.j2
@@ -12,18 +12,21 @@
 <p>status: <strong class="status">{{ status }}</strong></p>
 <p>originally: <strong>{{ orig_name }}</strong></p>
 
-<section class="progress-section" {% if progress.get('stage') is None %}style="display: none" {% endif %}>
+<section class="progress-section" {% if status !="in progress" or progress.get('stage') is none %}style="display: none"
+    {% endif %}>
     <h3>progress</h3>
-    <p>
-        stage:
-        <data id="stage">{{ progress.get('stage') or '' }}</data> /
-        <data id="stages">{{ progress.get('stages') or '' }}</data>
-    </p>
-    <p>
-        step:
-        <data id="step">{{ progress.get('step') or '' }}</data> /
-        <data id="stage-steps">{{ progress.get('stage-steps') or '' }}</data>
-    </p>
+    <ul>
+        <li>
+            stage:
+            <data id="stage">{{ progress.get('stage') or '' }}</data> /
+            <data id="stages">{{ progress.get('stages') or '' }}</data>
+        </li>
+        <li>
+            step:
+            <data id="step">{{ progress.get('step') or '' }}</data> /
+            <data id="stage-steps">{{ progress.get('stage-steps') or '' }}</data>
+        </li>
+    </ul>
 </section>
 
 <script>
@@ -37,15 +40,20 @@
         }
 
         if (message.progress != null) {
-            document.querySelector("progress-section").style.display = "unset";
+            document.querySelector(".progress-section").style.display = "unset";
             for (const item in message.progress) {
                 document.getElementById(item).textContent = message.progress[item];
             }
         }
+
+        if (message.output != null) {
+            setTimeout(() => {
+                window.location.reload();
+            }, 250);
+        }
     };
 </script>
 
-{% if outputs %}
 <ul class="track-list">
     {% for output in outputs %}
     <li>
@@ -56,6 +64,5 @@
     </li>
     {% endfor %}
 </ul>
-{% endif %}
 
 {% endblock %}
diff --git a/src/run.sh b/src/run.sh
index aff82a0..0dccd80 100755
--- a/src/run.sh
+++ b/src/run.sh
@@ -1,3 +1,3 @@
 #!/usr/bin/env sh
 
-gunicorn -b '127.0.0.2:8000' demucs_server:app
+gunicorn --threads 16 -b '127.0.0.2:8000' demucs_server:app