Selaa lähdekoodia

Fixed ansi escape sequences dorking up user list

Pjotir 2 vuotta sitten
vanhempi
commit
b560664953
1 muutettua tiedostoa jossa 9 lisäystä ja 5 poistoa
  1. 9 5
      flaskapp.py

+ 9 - 5
flaskapp.py

@@ -2,6 +2,7 @@ import subprocess
 from flask import Flask, render_template
 from dotenv import load_dotenv
 import os
+import re
 
 load_dotenv()
 app = Flask(__name__)
@@ -21,14 +22,17 @@ def home():
         capture_output=True,
         text=True,
     )
-    messages = result.stdout.strip().split(": ")
+    resultstring = result.stdout.strip()
+    resultstring = re.compile(r'\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])').sub('', resultstring)
+    messages = resultstring.split(': ')
+    print(messages)
     messagelist = messages[0].split(" ")
-    usercount = messagelist[2]
-    maxcount = messagelist[7]
+    usercount = int(messagelist[2])
+    maxcount = int(messagelist[7])
     userlist = None
     usercombolist = None
 
-    if len(messages) > 1:
+    if usercount > 0:
         userlist = messages[1].split(", ")
 
         usercombolist = []
@@ -46,4 +50,4 @@ def home():
 
 
 if __name__ == "__main__":
-    app.run(debug=True)
+    app.run(host="0.0.0.0")