From 430b4de995d70b93ed5e34a170105cc78f2e8fa2 Mon Sep 17 00:00:00 2001 From: migatu Date: Wed, 24 Apr 2024 17:31:52 +0200 Subject: [PATCH] Search headless (#8) * Fix * Final fix to headless * test * Fix * Ready for deployment --- bot.py | 5 +++-- communication_subroutine.py | 15 ++++++++------- conjurer_librarian/test_send.py | 4 ++-- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/bot.py b/bot.py index 1aee56c..9dadfad 100644 --- a/bot.py +++ b/bot.py @@ -693,17 +693,19 @@ async def check_data_q(): ctx = fresh_data.ctx message += f' Dzielny poszukiwaczu @{searcher} w odpowiedzi na twoje zapytanie {query} nr {fresh_data.uuid}' else: - ctx = client.get_channel(1062047367337095268) + ctx = client.get_channel(1062047571557744721) message += f' Mam wynik dla zapytania {fresh_data.uuid} ale że Hammer coś grzebał nie pamiętam kto to chciał i co chciał' message += 'nasza biblioteka służy Ci odpowiedzią. Przy dźwięku fanfar winda się otwiera a w środku ' if len(entries)<1: message += "niestety nie ma nic" + await ctx.send(message) elif len(entries)>=1 and len(entries)<5: message += " znajduje się coś:\n" for item in entries: message+=item + await ctx.send(message) else: message+= " znajduje się cholernie dużo:\n" for item in entries: @@ -712,7 +714,6 @@ async def check_data_q(): await ctx.send(message) message = "" - await ctx.send(message) #Kept for sentimental reasons #await ctx.send(f"O. A tak będzie wyglądało coś ciekawego w przyszłości: {data}") except Empty: diff --git a/communication_subroutine.py b/communication_subroutine.py index 3cda26c..d9a648b 100644 --- a/communication_subroutine.py +++ b/communication_subroutine.py @@ -102,18 +102,19 @@ def scan_incoming(_logger): try: answer = incoming_q.get(block=False) _logger.info("DATA FOUND") + record_stored = False for record in awaiting_q: if record.uuid in answer.keys(): + record_stored = True + record.stop = True + record.entries = answer[record.uuid] + IN_COMM_Q.put(record) + if not record_stored: + for key in answer.keys(): + record = QueryControl("Orphaned", key, "Orphan", _logger, None) record.stop = True record.entries = answer[record.uuid] IN_COMM_Q.put(record) - else: - for key in answer.keys(): - record = QueryControl("Orphaned", key, "Orphan", _logger, None) - record.stop = True - record.entries = answer[record.uuid] - record.uuid = "000000" - IN_COMM_Q.put(record) except Empty: time.sleep(1) diff --git a/conjurer_librarian/test_send.py b/conjurer_librarian/test_send.py index e029f9c..eea519f 100644 --- a/conjurer_librarian/test_send.py +++ b/conjurer_librarian/test_send.py @@ -26,8 +26,8 @@ async def send_results(): database = json.load(s_file) except JSONDecodeError: pass - result = database["affd0dbc-e2c8-4173-b678-4103c0866495"] - result = {"affd0dbc-e2c8-4173-b678-4103c0866495":result} + result = database["4bacbca0-ce3b-45c6-90a1-05c70b46b740"] + result = {"4bacbca0-ce3b-45c6-90a1-05c70b46b740":result} coroutine = asyncio.to_thread( requests.post,