CreatBot/GeneralKlipperScreen
7
0
Fork 0
forked from CreatBot/CreatBotKlipperScreen
Code Pull Requests Activity

cleanup quotes in connection status messages

Browse Source
This commit is contained in:
alfrix 2022-11-29 08:12:43 -03:00
parent 49c2e4f1d7
commit 3047fde812
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ks_includes/KlippyRest.py
View File

@ -59,20 +59,17 @@ class KlippyRest:
if data: if data:
self.status = '' self.status = ''
else: else:
logging.error(self.status) logging.error(self.status.replace('\n', '>>'))
return data return data
@staticmethod @staticmethod
def format_status(status): def format_status(status):
try: try:
rep = {"HTTPConnectionPool": "", "/server/info ": "", "Caused by ": "", "(": "", ")": "", ": ": "\n"} rep = {"HTTPConnectionPool": "", "/server/info ": "", "Caused by ": "", "(": "", ")": "",
": ": "\n", "'": "", "`": "", "\"": ""}
rep = {re.escape(k): v for k, v in rep.items()} rep = {re.escape(k): v for k, v in rep.items()}
pattern = re.compile("|".join(rep.keys())) pattern = re.compile("|".join(rep.keys()))
err = "" status = pattern.sub(lambda m: rep[re.escape(m.group(0))], f"{status}").split("\n")
for _ in pattern.sub(lambda m: rep[re.escape(m.group(0))], f"{status}").split("\n"): return "\n".join(_ for _ in status if "urllib3" not in _ and _ != "")
if not _ or "urllib3" in _ or _ == "":
continue
err += _ + "\n"
return err
except TypeError or KeyError: except TypeError or KeyError:
return status return status