Server side work

conjurer_librarian/conjurer_librarian.py

@@ -1,4 +1,3 @@
-from logging import handlers
 import re
 import logging
 import threading
@@ -42,6 +41,7 @@ class Librarian(object):
         self.hit = 0
         self.total = 0
         self.app = app
+        self.logger = app.logger
         self.live_results = []
         self.final_result = []
         self.not_in_db = []
@@ -54,15 +54,15 @@ class Librarian(object):
         self.search_result_from_cr.update(result)
         self.total = result['message']['total-results']
         self.fetched += len(result['message']['items'])
-        self.app.logger.info (self.total)
-        self.app.logger.info(self.fetched)
+        self.logger.info (self.total)
+        self.logger.info(self.fetched)
         while self.total > self.fetched and self.limit > self.fetched:
             result = self.cr.works(query = query, limit = 1000)
             self.search_result_from_cr.update(result)
             self.total = result['message']['total-results']
             self.fetched += len(result['message']['items'])
-            self.app.logger.info (self.total)
-            self.app.logger.info(self.fetched)
+            self.logger.info (self.total)
+            self.logger.info(self.fetched)
             time.sleep(0.1)
         self.app.logger.info("CROSSREF DONE")
         #TODO: add to sql with UUID
@@ -131,8 +131,8 @@ class Librarian(object):
         temp = []
         refined_result = []
         for key in unrefined_reqult:
-            self.app.logger.info("KEY:")
-            self.app.logger.info(key)
+            self.logger.info("KEY:")
+            self.logger.info(key)
 
         for item in unrefined_reqult[self.uuid]["summary"]:
             if item["container"] == "NO" and item["title"]:                
@@ -155,7 +155,7 @@ class Librarian(object):
         #TODO: DOłożyć sprawdzenie czy w rafinowanym pliku już nie mamy częściowego wyniku tutaj bo zanim w ogóle otworzymy nierafinowany
         #Search sql for UUID
         #SQL SELECT * FROM RESULTS WHERE UUID = uuid
-        self.app.logger.info(f"Search started {self.uuid}")
+        self.logger.info(f"Search started {self.uuid}")
         database = None
         query = self.query
         with open("cr_results.json", "r+", encoding="utf-8") as cr_file:
@@ -313,31 +313,23 @@ async def get_partial():
 
 #=======================================MAIN===================================================
 if __name__ == "__main__":
-    app.logger.setLevel(logging.DEBUG)
-    h1 = handlers.RotatingFileHandler(
-    filename="E:\\logs\\librarian.log",
-    encoding="utf-8",
-    mode="a",
-    maxBytes=6 * 1024 * 1024,
-    backupCount=6,
-    )
-
-    app.logger.addHandler(h1)
+    logger = app.logger
+    logger.setLevel(logging.DEBUG)
     threads = []
     threads.append(threading.Thread(target=waitress_run))
     #threads.append(threading.Thread(target=flask_debug))
     bgtask = BackgroundTaskSearch()
     bgtask.app = app
     threads.append(bgtask)
-    threads.append(threading.Thread(target = scrape_bot.scraper, args=(app.logger,)))
+    threads.append(threading.Thread(target = scrape_bot.scraper, args=(logger,)))
     i = 0
     for worker in threads:
         try:
-            app.logger.info(f"App number: {i}")
+            logger.info(f"App number: {i}")
             i+=1
             worker.start()
         except RuntimeError as e:
-            app.logger.error("Exploded")
+            logger.error("Exploded")
             print(str(e))
     for worker in threads:
         worker.join()

conjurer_musician/conjurer_musician.py

@@ -214,8 +214,9 @@ def wyszukaj(word_list, how_many, _logger=None, return_to_bot=True):
         if not return_to_bot:
 
             with open(
-               "/home/pi/Conjurer/priority_queue.playlist", "a", encoding="utf-8"
+               "/home/pi/Conjurer/priority_queue.playlist", "r+", encoding="utf-8"
             ) as s_file:
+                s_file.truncate(0)
                 for item in return_list:
                     s_file.write(item[1] + "\n")
     return return_list

conjurer_musician/radio_conjurer.liq

@@ -4,7 +4,7 @@ enable_replaygain_metadata()
 s1 = replaygain(playlist(reload_mode="watch", "/home/pi/Conjurer/all_playlist.playlist"))
 s2 = replaygain(playlist(reload_mode="watch", "/home/pi/Conjurer/priority_queue.playlist"))
 
-s = random(id="randomizer", weights=[7, 10], [s2, s1])
+s = random(id="randomizer", weights=[7000, 100], [s2, s1])
 
 interactive.harbor(port = 9999)
 f = interactive.float("f", description="Frequency", min=0., max=1000.,unit="Hz", 200.)
@@ -19,10 +19,24 @@ s = crossfade(fade_out=3., fade_in=3., duration=5., s)
 s = amplify(a,s)
 
 s = blank.skip(max_blank=2., s)
+
+emergency = single("/home/pi/RetroPie/mp3/Youtube/Dr. Peacock - Trip to Ireland [GvrvQTUbUcA].mp3")
+radio = fallback(id="switcher",track_sensitive = false, [s, emergency]) 
+
+handle_metadata = fun (m) -> begin
+    print(m["title"])
+    print(m["artist"])
+    print(m["filename"])
+end
+radio.on_metadata(handle_metadata)
+interactive.persistent("script.params")
+
 log_to_stdout = true
 log_to_file = true
 logpath = "/home/pi/Conjurer/radio_log.log"
-loglevel = 4
+loglevel = 3
+
+# Enable logging on Standard Output and set logging level.
 set("log.stdout",log_to_stdout)
 set("log.level",loglevel)
 
@@ -30,19 +44,5 @@ set("log.level",loglevel)
 set("log.file",log_to_file)
 set("log.file.path",logpath)
 
-emergency = single("/home/pi/RetroPie/mp3/Youtube/Dr. Peacock - Trip to Ireland [GvrvQTUbUcA].mp3")
-radio = fallback(id="switcher",track_sensitive = false, [s, emergency]) 
-
-handle_metadata = fun (m) -> begin
-    log.info(m["title"])
-    log.info(m["artist"])
-    log.info(m["filename"])
-end
-radio.on_metadata(handle_metadata)
-interactive.persistent("script.params")
-
-
-# Enable logging on Standard Output and set logging level.
-
 output.file.hls("/tmp/hls",[("mp3-low", %mp3(bitrate=96)), ("mp3-hi", %mp3(bitrate=160))],radio)
 output.icecast(%mp3, host="retropie", port=8000,password=credentials.password, icy_metadata="true", mount="mp3-stream", radio)