|
|
@@ -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 = []
|
