Tag: 1.4

Intermediate commits (oldest → newest): - Music service (#5) - Fine tuning of radiostation - Logging fix in radio - Logging fix - fx - fx - fx - Fix to deprecated - Fine tuning - Logging fix on conjurer_librarian - Fix logging with rotation - fixing favourites
2026-07-14 21:38:38 +00:00 · 2025-10-30 16:59:00 +01:00
parent 04638c9141
commit 806cada1c1
13 changed files with 35086 additions and 60 deletions
@@ -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,21 +1,22 @@
+# This Python file uses the following encoding: utf-8
 """
 The provided Python script sets up a Flask web server to manage a list of music files, with
 functions for rescanning the music folder, updating the music list, and serving the music list via
 API endpoints.
 """
 import json
+import logging
 import re
-from pathlib import Path
-from platform import uname
 import threading
 import time
 from datetime import datetime
-from sys import platform
-import logging
-from flask import Flask, jsonify, request
-from waitress import serve
 from logging import handlers
+from pathlib import Path
+from platform import uname
+from sys import platform

+from flask import Flask, jsonify, redirect, request, send_from_directory
+from waitress import serve

 HOST_ADDRESS = "192.168.1.15"
 PORT_ADDRESS = 5000
@@ -28,7 +29,6 @@ if platform in ("linux", "linux2"):
        LOGSTORE = "/home/mtuszowski/conjurer/logs/"
        ENCODING = "utf-8"

-
    else:
        LOGFILE = "/home/pi/Conjurer/discord_mus_service.log"
        NETRC_FILE = "/home/pi/.netrc"
@@ -37,8 +37,33 @@ if platform in ("linux", "linux2"):
        MUSIC_FOLDER = "/home/pi/RetroPie/mp3/"


-
 music_file_list = []
+
+
+def create_playlist():
+    """
+    Reads a JSON file containing a playlist and writes the playlist items to a text file.
+
+    The JSON file path is '/home/pi/Conjurer/playlist.json',
+    and the text file path is '/home/pi/Conjurer/all_playlist.playlist'.
+
+    Raises:
+        JSONDecodeError: If the JSON file cannot be decoded.
+
+    """
+    with open("/home/pi/Conjurer/playlist.json", "r+", encoding="utf-8") as r_file:
+        with open(
+            "/home/pi/Conjurer/all_playlist.playlist", "w", encoding="utf-8"
+        ) as w_file:
+            try:
+                playlist = json.load(r_file)
+                for item in playlist:
+                    w_file.write(item)
+                    w_file.write("\n")
+            except json.JSONDecodeError:
+                pass
+
+
 def rescan():
    """
    The `rescan` function logs a message, scans for mp3 files in a specified folder,
@@ -50,6 +75,14 @@ def rescan():
        if platform == "win32":
            temp_music_file = temp_music_file.replace("/", "\\")
        music_file_list.append(temp_music_file)
+    with open("/home/pi/Conjurer/playlist.json", "r+", encoding="utf-8") as s_file:
+        database = music_file_list
+        # self.app.logger.info("DUMPING DATA")
+        s_file.truncate(0)
+        s_file.seek(0)
+        json.dump(database, s_file)
+    create_playlist()
+

 def thread_rescan():
    """
@@ -62,10 +95,27 @@ def thread_rescan():
        logging.info("Rescan triggered")
        rescan()

+
 app = Flask(__name__)

-def wyszukaj(word_list, how_many):
-    logger = logging.getLogger()
+
+# TODO: Odpalić wyszukiwarki w wątkach i dopiero po wszystkim zsumować wyszukiwanie.
+def wyszukaj(word_list, how_many, _logger=None, return_to_bot=True):
+    """
+    Searches for music files based on a list of keywords and returns a list of matching files.
+
+    Args:
+        word_list (list): A list of keywords to search for.
+        how_many (int): The maximum number of matching files to return.
+
+    Returns:
+        list: A list of matching files, sorted by their search weight.
+
+    """
+    if _logger is None:
+        fun_logger = logging.getLogger()
+    else:
+        fun_logger = _logger
    return_list = []
    search_weight = []

@@ -79,7 +129,7 @@ def wyszukaj(word_list, how_many):
        skip_start = 1
    for word in word_list[skip_start:]:
        token_weight = len(word)
-        logger.info("Słowo kluczowe: %s", word)
+        fun_logger.info("Słowo kluczowe: %s", word)
        itr = 0
        for file in music_file_list:
            file = file.split(SEPARATOR_FILE_PATH)
@@ -119,6 +169,7 @@ def wyszukaj(word_list, how_many):
            else:
                skip = 4
            matched_times = 1
+            # TODO: To do wątków albo for asynchroniczny
            for itm in all_words[skip:]:
                pingu += 1
                pattern = ".*" + word + ".*"
@@ -134,27 +185,42 @@ def wyszukaj(word_list, how_many):
                    matched_times += 1
            itr += 1

-    logger.info("Stworzylem tablice wag zajęło mi to %s", datetime.now() - time_start)
+    fun_logger.info(
+        "Stworzylem tablice wag zajęło mi to %s", datetime.now() - time_start
+    )
    time_start = datetime.now()
    item_to_search = max_weight(search_weight)
    itr = 0
    if item_to_search == 0:
-        return None
+        return []
    not_found = True
    return_list = []
    if int(how_many) <= 0:
-        logger.info("Jeden plik do zagrania")
+        fun_logger.info("Jeden plik do zagrania")
        while not_found:
            if search_weight[itr][0] == item_to_search:
                return_list.append(search_weight[itr])
-                return return_list
+                if not return_to_bot:
+                    with open(
+                        "/home/pi/Conjurer/priority_queue.playlist", "r+", encoding="utf-8"
+                    ) as s_file:
+                        s_file.write(search_weight[itr][1])
+                break
            itr += 1
    else:
-        logger.info("Wiele plików do zagrania")
+        fun_logger.info("Wiele plików do zagrania")
        search_weight.sort(key=lambda x: x[0], reverse=True)
        return_list.extend(search_weight[: int(how_many)])
+        if not return_to_bot:
+
+            with open(
+               "/home/pi/Conjurer/priority_queue.playlist", "a", encoding="utf-8"
+            ) as s_file:
+                for item in return_list:
+                    s_file.write(item[1] + "\n")
    return return_list

+
 def max_weight(lista):
    """
    Take a list of weights and return the maximum weight.
@@ -184,19 +250,44 @@ def remove_characters(string, character):


@app.route("/stream", methods=["GET"])
-async def stream_music():
+def stream_music():
    """
    The function `get_music_list` returns a JSON object containing a list of music files.
    :return: A JSON response containing a key "music_file_list" with the value of the variable
    `music_file_list`.
    """
-    try:
-        m3u8 = Path("/tmp/hls/stream.m3u8")
-        r = Response(m3u8)
-        r.headers["Content-Type"] = "application/mpegURL"
-        return r, 200
-    except FileNotFoundError:
-        return jsonify({"error": "No stream available"}), 404
+    return send_from_directory("/tmp/hls", "stream.m3u8")
+
+@app.route('/<string:file_name>')
+def stream(file_name):
+    video_dir = '/tmp/hls'
+    return send_from_directory(video_dir, file_name)
+
+
+@app.route("/stream_mp3", methods=["GET"])
+def stream_music_mp3():
+    """
+    The function `get_music_list` returns a JSON object containing a list of music files.
+    :return: A JSON response containing a key "music_file_list" with the value of the variable
+    `music_file_list`.
+    """
+    return redirect("http://www.example.com", code=302)
+
+
+@app.route("/clear_pr_pls", methods=["GET"])
+def clear_pr_pls():
+    """
+    The function `get_music_list` returns a JSON object containing a list of music files.
+    :return: A JSON response containing a key "music_file_list" with the value of the variable
+    `music_file_list`.
+    """
+    with open(
+        "/home/pi/Conjurer/priority_queue.playlist", "w", encoding="utf-8"
+        ) as s_file:
+        s_file.truncate(0)
+    return_data = jsonify(isError=False, message="Success", statusCode=200, data=[])
+    return return_data, 200
+


@app.route("/mp3", methods=["GET"])
@@ -229,6 +320,7 @@ def update_music_list():
    )
    return return_data

+
@app.route("/get_music", methods=["POST"])
 def look_for_playlist():
    """
@@ -245,7 +337,31 @@ def look_for_playlist():
    app.logger.info(record["lista_slow"])
    app.logger.info(record["UUID"])
    app.logger.info(record["dlugosc_plejlisty"])
-    return_data = wyszukaj(record["lista_slow"],record["dlugosc_plejlisty"])
+    return_data = wyszukaj(record["lista_slow"], record["dlugosc_plejlisty"], app.logger, True)
+
+    return_data = (
+        jsonify(isError=False, message="Success", statusCode=200, data=return_data),
+        200,
+    )
+    return return_data
+
+@app.route("/add_to_priority", methods=["POST"])
+def add_to_priority():
+    """
+    The function `update_music_list` receives a POST request with a JSON payload, logs the received
+    item, adds it to a music file list, and returns a success message along with the updated record.
+    :return: The function `update_music_list` is returning a tuple containing a JSON response and a
+    status code. The JSON response includes keys `isError`, `message`, `statusCode`, and `data`,
+    with values indicating the success of the operation and the data that was
+    received and added to the `music_file_list`.
+    The status code returned is 200, indicating a successful response.
+    """
+    record = json.loads(request.data)
+    app.logger.info(record)
+    app.logger.info(record["lista_slow"])
+    app.logger.info(record["UUID"])
+    app.logger.info(record["dlugosc_plejlisty"])
+    return_data = wyszukaj(record["lista_slow"], record["dlugosc_plejlisty"], app.logger, False)

    return_data = (
        jsonify(isError=False, message="Success", statusCode=200, data=return_data),
@@ -262,6 +378,7 @@ def flask_debug():
    # trunk-ignore(bandit/B201)
    app.run(debug=True, use_reloader=False, host=HOST_ADDRESS, port=PORT_ADDRESS)

+
 def waitress_run():
    """
    The `waitress_run` function serves the `app` on host "0.0.0.0"
@@ -269,10 +386,13 @@ def waitress_run():
    """
    serve(app, host=HOST_ADDRESS, port=PORT_ADDRESS)

+
 if __name__ == "__main__":
-    logger = logging.getLogger('conjurer_musician')
+    logger = logging.getLogger("conjurer_musician")
    logger.setLevel(logging.DEBUG)
-    formatter = logging.Formatter("%(asctime)s - %(name)s - %(levelname)s - %(message)s")
+    formatter = logging.Formatter(
+        "%(asctime)s - %(name)s - %(levelname)s - %(message)s"
+    )
    handler = handlers.RotatingFileHandler(
        filename=LOGFILE,
        encoding=ENCODING,
@@ -286,6 +406,7 @@ if __name__ == "__main__":
    rescan()
    logger.info("Started")
    threads = []
+    #threads.append(threading.Thread(target=flask_debug))
    threads.append(threading.Thread(target=waitress_run))
    threads.append(threading.Thread(target=thread_rescan))

@@ -0,0 +1,48 @@
+let json.parse credentials  = file.contents("/home/pi/Conjurer/icecast_credentials.json")
+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])
+
+interactive.harbor(port = 9999)
+f = interactive.float("f", description="Frequency", min=0., max=1000.,unit="Hz", 200.)
+g = interactive.float("g", description="Gain", min=0., max=20.,unit="dB", 8.)
+b = bass_boost(frequency=f, gain=g, s)
+s = add([s, b])
+a = interactive.float("main_volume", min=0., max=20., 1.)
+s = compress.multiband.interactive(bands=3, s)
+
+s = nrj(normalize (s))
+s = crossfade(fade_out=3., fade_in=3., duration=5., s)
+s = amplify(a,s)
+
+s = blank.skip(max_blank=2., s)
+log_to_stdout = true
+log_to_file = true
+logpath = "/home/pi/Conjurer/radio_log.log"
+loglevel = 4
+set("log.stdout",log_to_stdout)
+set("log.level",loglevel)
+
+# Enable logging to file. See variable: logpath
+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)
@@ -0,0 +1,14 @@
+[Unit]
+Description=radio_conjurer Liquidsoap daemon
+After=network.target
+Documentation=http://liquidsoap.fm/
+
+[Service]
+User=pi
+WorkingDirectory=/home/pi/Conjurer/
+ExecStart=/home/pi/.opam/4.13.0/bin/liquidsoap /home/pi/Conjurer/radio_conjurer.liq
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
+Alias=radio_conjurer-liquidsoap.service
@@ -0,0 +1,6 @@
+#!/bin/bash
+cd ./conjurer
+git pull
+cd ..
+cp ./conjurer/conjurer_musician/conjurer_musician.py ./Conjurer
+sudo systemctl restart conjurer_musician.service
@@ -0,0 +1,6 @@
+#!/bin/bash
+cd ./conjurer
+git pull
+cd ..
+cp ./conjurer/conjurer_musician/radio_conjurer.liq ./Conjurer
+sudo systemctl restart radio_service.service
@@ -1,11 +0,0 @@
-#!/bin/bash
-python3 -m venv /home/pi/Conjurer-service/conjurer/file_webservice
-source ./bin/activate
-./bin/python3 -m pip install --upgrade pip
-./bin/python3 -m pip install -r requirements_musician.txt
-deactivate
-
-sudo cp ./conjurer_musician.service /etc/systemd/system/
-sudo systemctl daemon-reload
-sudo systemctl start conjurer_musician.service
-sudo systemctl enable conjurer_musician.service
@@ -1,5 +1,9 @@
 #!/bin/bash
+cd /home/pi
+mdkir Conjurer
+cd Conjurer
 python3 -m venv /home/pi/Conjurer/env
+cp /home/pi/conjurer/requirements_bot.txt /home/pi/Conjurer/
 source ./env/bin/activate
 ./env/bin/python3 -m pip install --upgrade pip
 ./env/bin/python3 -m pip install -r requirements_bot.txt
@@ -8,5 +12,5 @@ sed -i '1i\import shutil' ./env/lib/python3.11/site-packages/spotify_dl/youtube.
 deactivate
 sudo cp ./conjurer.service /etc/systemd/system/
 sudo systemctl daemon-reload
-sudo systemctl start conjurer_musician.service
-sudo systemctl enable conjurer_musician.service
+sudo systemctl start conjurer.service
+sudo systemctl enable conjurer.service
@@ -0,0 +1,26 @@
+#!/bin/bash
+cd /home/pi
+mkdir Conjurer
+cd Conjurer
+python3 -m venv /home/pi/Conjurer/env
+source /home/pi/Conjurer/env/bin/activate
+cp /home/pi/conjurer/conjurer_musician/requirements_musician.txt /home/pi/Conjurer/
+cp /home/pi/conjurer/conjurer_musician/conjurer_musician.py /home/pi/Conjurer/
+cp /home/pi/conjurer/conjurer_musician/radio_conjurer.liq /home/pi/Conjurer/
+touch /home/pi/Conjurer/discord_mus_service.log
+touch /home/pi/Conjurer/all_playlist.txt
+touch /home/pi/Conjurer/playlist.json
+touch /home/pi/Conjurer/priority_queue.playlist
+touch /home/pi/Conjurer/radio_log.log
+./env/bin/python3 -m pip install --upgrade pip
+./env/bin/python3 -m pip install -r requirements_musician.txt
+deactivate
+sudo cp /home/pi/conjurer/conjurer_musician/conjurer_musician.service /etc/systemd/system/
+sudo systemctl daemon-reload
+sudo systemctl start conjurer_musician.service
+sudo systemctl enable conjurer_musician.service
+
+sudo cp /home/pi/conjurer/conjurer_musician/radio_service.service /etc/systemd/system/
+sudo systemctl daemon-reload
+sudo systemctl start radio_service.service
+sudo systemctl enable radio_service.service