smueller/autopve
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed bug where Default keys were overridden

Browse Source
This commit is contained in:
Natan Keddem
2024-05-01 21:11:40 -04:00
parent 489ecbdeef
commit db3ed868e6
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
autopve/page.py
View File

@ -20,13 +20,13 @@ def build():
@app.post("/answer") @app.post("/answer")
async def post_answer(request: Request) -> PlainTextResponse: async def post_answer(request: Request) -> PlainTextResponse:
def response(answer: str, system_info: Dict[str, Any], data: Dict[str, Any]): def response(answer: str, system_info: Dict[str, Any], data: Dict[str, Any]):
toml = tomlkit.dumps(default_data) toml = tomlkit.dumps(data)
toml_fixed = "" toml_fixed = ""
for line in toml.splitlines(): for line in toml.splitlines():
if len(line) > 0 and line[0] == '"': if len(line) > 0 and line[0] == '"':
line = line.replace('"', "", 2) line = line.replace('"', "", 2)
toml_fixed = toml_fixed + line + "\n" toml_fixed = toml_fixed + line + "\n"
r = history.Request(answer=answer, response=toml_fixed, system_info=dict(system_info)) r = history.Request(answer=answer, response=toml_fixed, system_info=copy.deepcopy(system_info))
history.History.add_history(r) history.History.add_history(r)
for client in Client.instances.values(): for client in Client.instances.values():
if not client.has_socket_connection: if not client.has_socket_connection:
@ -37,12 +37,12 @@ def build():
system_info = await request.json() system_info = await request.json()
system_info_raw = json.dumps(system_info) system_info_raw = json.dumps(system_info)
default_data = dict(storage.answer("Default")) default_data = copy.deepcopy(storage.answer("Default"))
answers = list(storage.answers.keys()) answers = list(storage.answers.keys())
if "Default" in answers: if "Default" in answers:
answers.remove("Default") answers.remove("Default")
for answer in answers: for answer in answers:
answer_data = dict(storage.answer(answer)) answer_data = copy.deepcopy(storage.answer(answer))
if "match" in answer_data: if "match" in answer_data:
if len(answer_data["match"]) > 0 and answer_data["match"] in system_info_raw: if len(answer_data["match"]) > 0 and answer_data["match"] in system_info_raw:
if "global" in default_data and "global" in answer_data: if "global" in default_data and "global" in answer_data: