Compare commits

...

12 Commits

Author SHA1 Message Date
gitea fe81f5e8fc fix 2024-04-18 00:30:45 +02:00
gitea 6d51412ea3 fixing favourites 2024-04-18 00:21:34 +02:00
gitea 382cf5d501 Fix logging with rotation 2024-04-18 00:03:44 +02:00
gitea e121c6dc39 Logging fix on conjurer_librarian 2024-04-17 23:55:01 +02:00
gitea 548496e0a6 Fine tuning 2024-04-17 23:10:45 +02:00
gitea 99409f7c0b Fix to deprecated 2024-04-17 23:08:31 +02:00
gitea fd1107cd1b fx 2024-04-17 23:07:07 +02:00
gitea f08ce02e85 fx 2024-04-17 23:05:45 +02:00
gitea 78346d8448 fx 2024-04-17 23:04:16 +02:00
gitea c780308541 Logging fix 2024-04-17 22:59:52 +02:00
gitea cc0af0ce32 Logging fix in radio 2024-04-17 22:53:53 +02:00
gitea 99e3dd7dca Fine tuning of radiostation 2024-04-17 22:39:20 +02:00
3 changed files with 38 additions and 31 deletions
+21 -13
View File
@@ -1,3 +1,4 @@
from logging import handlers
import re
import logging
import threading
@@ -41,7 +42,6 @@ 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.logger.info (self.total)
self.logger.info(self.fetched)
self.app.logger.info (self.total)
self.app.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.logger.info (self.total)
self.logger.info(self.fetched)
self.app.logger.info (self.total)
self.app.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.logger.info("KEY:")
self.logger.info(key)
self.app.logger.info("KEY:")
self.app.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.logger.info(f"Search started {self.uuid}")
self.app.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,23 +313,31 @@ async def get_partial():
#=======================================MAIN===================================================
if __name__ == "__main__":
logger = app.logger
logger.setLevel(logging.DEBUG)
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)
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=(logger,)))
threads.append(threading.Thread(target = scrape_bot.scraper, args=(app.logger,)))
i = 0
for worker in threads:
try:
logger.info(f"App number: {i}")
app.logger.info(f"App number: {i}")
i+=1
worker.start()
except RuntimeError as e:
logger.error("Exploded")
app.logger.error("Exploded")
print(str(e))
for worker in threads:
worker.join()
+1 -2
View File
@@ -214,9 +214,8 @@ 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", "r+", encoding="utf-8"
"/home/pi/Conjurer/priority_queue.playlist", "a", encoding="utf-8"
) as s_file:
s_file.truncate(0)
for item in return_list:
s_file.write(item[1] + "\n")
return return_list
+16 -16
View File
@@ -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=[7000, 100], [s2, s1])
s = random(id="randomizer", weights=[7, 10], [s2, s1])
interactive.harbor(port = 9999)
f = interactive.float("f", description="Frequency", min=0., max=1000.,unit="Hz", 200.)
@@ -19,24 +19,10 @@ 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 = 3
# Enable logging on Standard Output and set logging level.
loglevel = 4
set("log.stdout",log_to_stdout)
set("log.level",loglevel)
@@ -44,5 +30,19 @@ 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)