View att 1

Fix

33

fx

Final fix

fix

Test

bot.py

@@ -684,10 +684,18 @@ async def check_music():
 async def check_data_q():
     try:
         data = IN_COMM_Q.get(block=False)
+        logger.info(data)
+        logger.info(data.entries)
+        entries = []
         if data.stop:
             searcher = data.author
             ctx = data.ctx
             query = data.content
+            i = 1
+            while data.entries:
+               doi, desc = data.entries.popitem()
+               entries.append(f"{i}. {desc["Title"]} z DOI {doi} i jest to {desc["type"]}")
+               i+=1
             entries = data.replies
             message = '*Z podłogi wysuwa się winda na książki*'
             message += f' Dzielny poszukiwaczu {searcher} w odpowiedzi na twoje zapytanie {query}'
@@ -697,11 +705,11 @@ async def check_data_q():
             elif len(entries)>1 and len(entries)<5:
                 message += " znajduje się coś:\n"
                 for item in entries:
-                    message+=str(item["DOI"])
+                    message+=item
             else:
                 message+= " znajduje się cholernie dużo:\n"
                 for item in entries:
-                    message+=str(item["DOI"])
+                    message+=item
                     if len(message) > 1500:
                         await ctx.send(message)
                         message = ""
@@ -2248,7 +2256,6 @@ async def krecimy_pornola(ctx):
 
 # *================================== Run
 if __name__ == "__main__":
-    # TODO: wpakowac kondzia w wątki odpalic asynchronicznie rownolegle z flaskiem do sterowania nim
     logger.info("Starting discord bot")
     threads = []
     logger.info("Starting discord bot: Creating threads")

communication_subroutine.py

@@ -54,16 +54,16 @@ def scan_queue(_logger):
 def scan_incoming(_logger):
     while True:
         try:
-            app.logger.info("DATA FOUND")
             answer = incoming_q.get(block=False)
+            _logger.info("DATA FOUND")
             for record in awaiting_q:
                 if record.uuid in answer.keys():
                     record.stop = True
                     record.entries = answer[record.uuid]
-                    IN_COMM_Q.put(request)
+                    IN_COMM_Q.put(record)
         except Empty:
             time.sleep(1)
-            break
+
 
 def comm_subroutine(logger):
     #logger.setLevel(logging.DEBUG)