Better output and fix blocking on process kill

R2Boyo25 · May 7, 2023 · f17a6d3 · f17a6d3
1 parent 4d854b5
commit f17a6d3
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 3 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -1,3 +1,4 @@
 flask
 toml
 flask_sock
+ansi2html
diff --git a/static/proc.css b/static/proc.css
@@ -17,8 +17,9 @@ th {
     background-color: #080808;
     padding: 25px;
     border-radius: 25px;
+    font-size: 1.5em;
 }
 
-table {
+table:not(:last-of-type) {
     margin-bottom: 50px;
 }
diff --git a/static/table.css b/static/table.css
@@ -11,6 +11,11 @@ td, th {
     height: 50px;
     word-wrap: break-word;
     font-size: 20pt;
+    vertical-align: middle;
+}
+
+tr:nth-child(even) {
+    background-color: #0000002f
 }
 
 #output {

diff --git a/villicus.py b/villicus.py
@@ -114,11 +114,14 @@ def out(self):
         while 1:
             tmp = self.process.stdout.readline()
 
-            if not tmp and not self.process.poll():
+            if not tmp:
                 break
 
             self.curout.append(tmp.decode().strip("\n"))
 
+            if not self.process.poll():
+                break
+
         return "\n".join(self.curout)
 
     @property
@@ -332,9 +335,12 @@ def unpauseProc(proc):
     return redirect("/proc/" + proc)
 
 
+from ansi2html import Ansi2HTMLConverter
+conv = Ansi2HTMLConverter()
+
 @app.route("/out/<proc>")
 def statTest(proc):
-    return str(procs.proc(proc).out).replace("\n", "<br>\n")
+    return conv.convert(str(procs.proc(proc).out))
 
 
 @app.route("/reload")