Bugfix in script deploy_music.sh

Adding playlists, various bufixes and installation scripts

Fixing

Rename

KUUUURWA

Install script music bot

fx

Fix ?

fix

Synchro

test

test

Undo

tst

test

tst

Undo changes

test

fx

tst

fx

Test commit of two files priority queue.

bot.py

@@ -46,12 +46,7 @@ from spotify_dl import youtube as youtube_download
 
 from communication_subroutine import comm_subroutine, IN_COMM_Q, OUT_COMM_Q
 
-# *=========================== Classes definition
 
-# The above code is defining a TypedDict called `Music_Config` in Python. This TypedDict has three
-# keys: "ctx" which is an optional string, "queue" which is a list of strings, and "requester" which
-# is a list of strings. This TypedDict is used to define the structure of a dictionary that should
-# have these specific keys and value types.
 Music_Config = TypedDict(
     "Music_Config",
     {
@@ -63,10 +58,6 @@ Music_Config = TypedDict(
 
 
 class QueryControl:
-    """
-    This class `QueryControl` is used to manage queries with information about the author, UUID,
-    content, logger, context, and replies.
-    """
     def __init__(self, query_author, query_uuid, query_content, uplogger, ctx) -> None:
         self.author = query_author
         self.uuid = query_uuid
@@ -79,95 +70,6 @@ class QueryControl:
         )
         self.replies = []
 
-class MusicFileList(object):
-    """
-    The `MusicFileList` class manages a list of music files, with the ability to refresh the list from a
-    file service or local directory and update the list with new items.
-    """
-
-    def __init__(self, uplogger) -> None:
-        self.music_file_list = []
-        self.file_service_active = False
-        self.logger = uplogger
-        self.logger.info("Created Playlist organizer class")
-
-    def refresh_file_list(self):
-        """
-        The `refresh_file_list` function attempts to connect to a file service to retrieve a list of music
-        files, and if unsuccessful, it populates the list by scanning a local directory for .mp3 files.
-        """
-        try:
-            self.logger.info("Attempt to connect to file service")
-            response = requests.get(f"{FILE_SERVICE_ADDRESS}{GET_MP3}", timeout=360)
-            self.music_file_list = response.json()["music_file_list"]
-            self.file_service_active = True
-        except requests.exceptions.RequestException as e:
-            for mp3_item in Path.glob(Path(MUSIC_FOLDER), "**/*.mp3"):
-                temp_music_file = mp3_item.as_posix()
-                if platform == "win32":
-                    temp_music_file = temp_music_file.replace("/", "\\")
-                self.music_file_list.append(temp_music_file)
-                self.file_service_active = False
-            self.logger.error(e.strerror)
-            self.logger.error("Service Unavailable")
-
-    def get_file_list(self):
-        """
-        The `get_file_list` function returns the list of music files stored in the object.
-        :return: The `music_file_list` attribute is being returned.
-        """
-        return self.music_file_list
-
-    def update_file_list(self, item):
-        """
-        The `update_file_list` function appends an item to a music file list and sends a POST request with
-        the item data to a file service address.
-
-        :param item: The `item` parameter in the `update_file_list` method is the file that you want to add
-        to the `music_file_list` attribute of the class instance. It is then sent as a JSON payload in a
-        POST request to a file service address along with the endpoint `SEND_MP3`
-        """
-        self.music_file_list.append(item)
-        post_data = {"item": str(item)}
-        requests.post(f"{FILE_SERVICE_ADDRESS}{SEND_MP3}", json=post_data, timeout=360)
-
-class DoSearchView(discord.ui.View):
-    def __init__(self, _uuid, result_list, *args, **kwargs) -> None:
-        super().__init__(*args, **kwargs)
-        self.uuid = _uuid
-        self.result_list = result_list
-
-    @discord.ui.button(
-        label="Nastepna strona", style=discord.ButtonStyle.primary, row=0
-    )
-    async def next_callback(self, interaction, button):
-        # emoji = await ctx.guild.fetch_emoji(id)
-        # button.emoji=1102174413887111189
-        logger.info("Pressed")
-        await interaction.response.edit_message(
-            content="You clicked the button!"
-        )  # Send a message when the button is clicked
-
-    @discord.ui.button(label="Wyszukaj wiecej", style=discord.ButtonStyle.danger, row=0)
-    async def reset_callback(self, interaction, button):
-        # emoji = await ctx.guild.fetch_emoji(id)
-        # button.emoji=1102174413887111189
-        logger.info("Pressed")
-        await interaction.response.edit_message(
-            content="You clicked the button!"
-        )  # Send a message when the button is clicked
-
-    @discord.ui.button(
-        label="Poprzednia Strona", style=discord.ButtonStyle.primary, row=0
-    )
-    async def perv_callback(self, interaction, button):
-        # emoji = await ctx.guild.fetch_emoji(id)
-        # button.emoji=1102174413887111189
-        logger.info("Pressed")
-        await interaction.response.edit_message(
-            content="You clicked the button!"
-        )  # Send a message when the button is clicked
-
 
 # *=========================================== Predefines
 formatter = logging.Formatter("%(asctime)s - %(name)s - %(levelname)s - %(message)s")
@@ -191,8 +93,6 @@ FILE_SERVICE_ADDRESS = "http://192.168.1.15:5000"
 GET_MP3 = "/mp3"
 SEND_MP3 = "/update_mp3"
 GET_PLAYLIST = "/get_music"
-ADD_TO_PRIO_PLAYLIST = "/add_to_priority"
-CLEAR_PRIO = "/clear_pr_pls"
 LIBRARIAN_SERVICE_ADDRESS = "http://192.168.1.192:5001"
 SEND_QUERY = "/query"
 TIME_BETWEEN_CALLS = 100000
@@ -293,6 +193,60 @@ logger.info("Playlist generation")
 
 # *=========================================== Load Data files
 
+
+class MusicFileList(object):
+    """
+    The `MusicFileList` class manages a list of music files, with the ability to refresh the list from a
+    file service or local directory and update the list with new items.
+    """
+
+    def __init__(self, uplogger) -> None:
+        self.music_file_list = []
+        self.file_service_active = False
+        self.logger = uplogger
+        self.logger.info("Created Playlist organizer class")
+
+    def refresh_file_list(self):
+        """
+        The `refresh_file_list` function attempts to connect to a file service to retrieve a list of music
+        files, and if unsuccessful, it populates the list by scanning a local directory for .mp3 files.
+        """
+        try:
+            self.logger.info("Attempt to connect to file service")
+            response = requests.get(f"{FILE_SERVICE_ADDRESS}{GET_MP3}", timeout=360)
+            self.music_file_list = response.json()["music_file_list"]
+            self.file_service_active = True
+        except requests.exceptions.RequestException as e:
+            for mp3_item in Path.glob(Path(MUSIC_FOLDER), "**/*.mp3"):
+                temp_music_file = mp3_item.as_posix()
+                if platform == "win32":
+                    temp_music_file = temp_music_file.replace("/", "\\")
+                self.music_file_list.append(temp_music_file)
+                self.file_service_active = False
+            self.logger.error(e.strerror)
+            self.logger.error("Service Unavailable")
+
+    def get_file_list(self):
+        """
+        The `get_file_list` function returns the list of music files stored in the object.
+        :return: The `music_file_list` attribute is being returned.
+        """
+        return self.music_file_list
+
+    def update_file_list(self, item):
+        """
+        The `update_file_list` function appends an item to a music file list and sends a POST request with
+        the item data to a file service address.
+
+        :param item: The `item` parameter in the `update_file_list` method is the file that you want to add
+        to the `music_file_list` attribute of the class instance. It is then sent as a JSON payload in a
+        POST request to a file service address along with the endpoint `SEND_MP3`
+        """
+        self.music_file_list.append(item)
+        post_data = {"item": str(item)}
+        requests.post(f"{FILE_SERVICE_ADDRESS}{SEND_MP3}", json=post_data, timeout=360)
+
+
 music_file_list = []
 music_file_list = MusicFileList(logger)
 music_file_list.refresh_file_list()
@@ -329,8 +283,6 @@ for key in word_reactions:
     word_reactions[key][2] = datetime.now()
 logger.info("Done")
 
-
-
 # *=========================================== Create Client
 logger.info("Creating discord bot")
 client = commands.Bot(intents=intents, command_prefix="$")
@@ -390,8 +342,8 @@ async def on_message(message):
     if isinstance(message.channel, discord.DMChannel):
         channel = client.get_channel(1064888712565100614)
         await channel.send("Słyszałem ja żem że: " + message.content)
-        return
+    else:
-    channel = message.channel
+        channel = message.channel
     await client.process_commands(message)
 
     message.content = message.content.lower()
@@ -730,40 +682,10 @@ async def check_music():
 @tasks.loop(seconds=3)
 # trunk-ignore(pylint/R0915)
 async def check_data_q():
+    channel = client.get_channel(1062047367337095268)
     try:
         data = IN_COMM_Q.get(block=False)
-        entries = []
+        await channel.send(f"O. A tak będzie wyglądało coś ciekawego w przyszłości: {data}")
-        if data.stop:
-            searcher = data.author
-            ctx = data.ctx
-            query = data.content
-            l_p = 1
-            for doi in data.entries:
-                logger.info(doi)
-                desc = data.entries[doi]
-                title = desc['Title'][0]
-                entries.append(f"{l_p}. {title} pod linkiem https://www.sci-hub.se/{doi} i jest to {desc['type']}\n")
-                l_p+=1
-            message = '*Z podłogi wysuwa się winda na książki*'
-            message += f' Dzielny poszukiwaczu @{searcher} w odpowiedzi na twoje zapytanie {query}'
-            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"
-            elif len(entries)>=1 and len(entries)<5:
-                message += " znajduje się coś:\n"
-                for item in entries:
-                    message+=item
-            else:
-                message+= " znajduje się cholernie dużo:\n"
-                for item in entries:
-                    message+=item
-                    if len(message) > 1500:
-                        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:
         pass
 
@@ -1125,10 +1047,8 @@ async def get_file(ctx, source, link):
         dir_path = None
         item_type, item_id = spotify.parse_spotify_url(link)
         if item_id:
-            coro = asyncio.to_thread(spotify.fetch_tracks, args=(spotify_ctrl, item_type, link))
+            file_list = spotify.fetch_tracks(spotify_ctrl, item_type, link)
-            file_list = await coro
+            directory_name = spotify.get_item_name(spotify_ctrl, item_type, item_id)
-            coro = asyncio.to_thread(spotify.get_item_name, args=(spotify_ctrl, item_type, item_id))
-            directory_name = await coro
             url_data = {"urls": []}
             url_dict = {}
             url_dict["save_path"] = Path(
@@ -1355,7 +1275,6 @@ async def wyszukaj(ctx, how_many=0, slowa_kluczowe=None):
         json=jrequest,
         timeout=360,
     )
-
     return_data = await coroutine
     if not return_data.status_code == 200:
         await ctx.send("Wołaj szefa - coś się wyjebało")
@@ -1781,63 +1700,6 @@ async def zagraj_mi_kawalek(ctx):
                 "Obawiam się że nie mogę nic znaleźć u siebie. Spróbuj komendy '$dej_co_ze_spotifaja' jeśli masz link"
             )
 
-@client.hybrid_command(
-    name="dodaj_do_ulubionych",
-    description="Dodaje do listy ulubionych w radiu",
-    guild=discord.Object(id=664789470779932693),
-)
-async def dodaj_do_ulubionych(ctx):
-    """
-    Generate a playlist in queue. First word in this command shall be int defining length of the playlist.
-    Rest of the line are search terms.
-
-    :param ctx: ctx stands for "context" and is a parameter commonly used in Discord.py commands. It
-    represents the context in which the command was invoked, including information such as the message,
-    the channel, the server, and the user who invoked the command. This parameter is required in all
-    Discord.py commands
-    """
-    async with ctx.typing():
-        logger.info("Zaczynam szukać timestamp %s", datetime.now())
-
-        dlugosc_playlisty = ctx.message.content.split()[1]
-        word_list = ctx.message.content.split()
-        jrequest = {
-            "lista_slow": word_list,
-            "dlugosc_plejlisty": dlugosc_playlisty,
-            "UUID": str(uuid.uuid4()),
-        }
-        coroutine = asyncio.to_thread(
-            requests.post,
-            f"{FILE_SERVICE_ADDRESS}{ADD_TO_PRIO_PLAYLIST}",
-            json=jrequest,
-            timeout=360,
-        )
-        _ = await coroutine
-
-@client.hybrid_command(
-    name="wyczysc_ulubione",
-    description="Czysci liste ulubionych w radiu",
-    guild=discord.Object(id=664789470779932693),
-)
-async def wyczysc_ulubione(ctx):
-    """
-    Generate a playlist in queue. First word in this command shall be int defining length of the playlist.
-    Rest of the line are search terms.
-
-    :param ctx: ctx stands for "context" and is a parameter commonly used in Discord.py commands. It
-    represents the context in which the command was invoked, including information such as the message,
-    the channel, the server, and the user who invoked the command. This parameter is required in all
-    Discord.py commands
-    """
-    async with ctx.typing():
-        coroutine = asyncio.to_thread(
-            requests.post,
-            f"{FILE_SERVICE_ADDRESS}{CLEAR_PRIO}",
-            json={},
-            timeout=360,
-        )
-        _ = await coroutine
-
 
 @client.hybrid_command(
     name="zrob_mi_plejliste",
@@ -2203,6 +2065,44 @@ async def parametry_muzyki_mego_ludu(
                 logger.info(exce)
 
 
+class DoSearchView(discord.ui.View):
+    def __init__(self, uuid, result_list, *args, **kwargs) -> None:
+        super().__init__(*args, **kwargs)
+        self.uuid = uuid
+        self.result_list = result_list
+
+    @discord.ui.button(
+        label="Nastepna strona", style=discord.ButtonStyle.primary, row=0
+    )
+    async def next_callback(self, interaction, button):
+        # emoji = await ctx.guild.fetch_emoji(id)
+        # button.emoji=1102174413887111189
+        logger.info("Pressed")
+        await interaction.response.edit_message(
+            content="You clicked the button!"
+        )  # Send a message when the button is clicked
+
+    @discord.ui.button(label="Wyszukaj wiecej", style=discord.ButtonStyle.danger, row=0)
+    async def reset_callback(self, interaction, button):
+        # emoji = await ctx.guild.fetch_emoji(id)
+        # button.emoji=1102174413887111189
+        logger.info("Pressed")
+        await interaction.response.edit_message(
+            content="You clicked the button!"
+        )  # Send a message when the button is clicked
+
+    @discord.ui.button(
+        label="Poprzednia Strona", style=discord.ButtonStyle.primary, row=0
+    )
+    async def perv_callback(self, interaction, button):
+        # emoji = await ctx.guild.fetch_emoji(id)
+        # button.emoji=1102174413887111189
+        logger.info("Pressed")
+        await interaction.response.edit_message(
+            content="You clicked the button!"
+        )  # Send a message when the button is clicked
+
+
 @client.hybrid_command(
     name="wyszukaj_linki_do_dokumentow",
     description="Szuka linkow doi w bazie crossref i podaje linki do scihuba",
@@ -2211,8 +2111,8 @@ async def parametry_muzyki_mego_ludu(
 async def wyszukaj_linki_do_dokumentow(ctx):
     query = ctx.message.content
     query_uuid = uuid.uuid4()
-    #TODO: TESTING ONLY!!
+    # query_uuid = "test"
-    #query_uuid = uuid.UUID('{12345678-1234-5678-1234-567812345678}')
+    # 3 wyslij Librariana
     json_query = {"UUID": str(query_uuid), "query": str(query)[30:], "page": 1}
     coroutine = asyncio.to_thread(
         requests.post,
@@ -2245,6 +2145,46 @@ async def wyszukaj_linki_do_dokumentow(ctx):
     await ctx.send(f"No dobra poszło. Zapamiętaj proszę {query_uuid} - to identyfikator twojego zapytania. Jesteś {queue_size} w kolejce."+
     " Zapytania obsługuje algorytm zasilany czterema chomikami zapierdalającymi w kołowrotku - więc wyniki najwcześniej za kilka godzi - ale mogą być też dni.")
 
+'''
+async def wyswietl_wyniki_wyszukiwania(ctx):
+
+    # 4 zwroc 4 wyniki od librariana
+    # 5 przyciski przy każdym wierszu pozwalają sprawdzić czy plik istnieje na scihubie - jeśli tak podaje link do sciagniecia
+    # 6 ostatni wiersz to dalej, wróć, skasuj, zaciagnij kolejne wyniki (jeśli jest ich więcej niż 1000)
+    result_view = DoSearchView(
+        uuid=str(query_uuid), result_list=query_response.json()["data"]
+    )
+    resulttab = []
+    resultlink = []
+    hit, fetched, total, _ = query_response.json()["data"][0]
+    answer = query_response.json()["data"][1]
+
+    for item in answer:
+        resulttab.append(str(item["title"]))
+        item_link = "https://sci-hub.se/" + str(item["DOI"])
+        resultlink.append(item_link)
+        logger.info(len(resulttab))
+    for i in range(0, min(4, len(resulttab))):
+        logger.info(i)
+        logger.info(resulttab[i])
+        logger.info(resultlink[i])
+        url = resultlink[i]
+        logger.info(url)
+        temp_label = str(resulttab[i])
+        temp_label = temp_label.strip("[']")
+        result_view.add_item(
+            discord.ui.Button(label=str(temp_label[0:79]), row=i + 1, url=url)
+        )
+
+    labelka = (
+        "Wyniki wyszukiwania dla: "
+        + str(query)[30:]
+        + f"\nWszystkich {total} sprawdzonych: {fetched} znalezionych: {hit} "
+    )  # ile znaleziono artykułów w ogóle, ile zostało po refine
+    await ctx.send(
+        labelka, view=result_view
+    )  # Send a message with our View class that contains the button
+'''
 
 @client.hybrid_command(
     name="krecimy_pornola",
@@ -2283,6 +2223,7 @@ 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

@@ -1,7 +1,6 @@
 import logging
 import threading
 import json
-import time
 from queue import Queue, Empty
 from flask import Flask, jsonify, request
 from waitress import serve
@@ -10,34 +9,28 @@ HOST_ADDRESS = "192.168.1.191"
 PORT_ADDRESS = 5000
 OUT_COMM_Q = Queue()
 IN_COMM_Q = Queue()
-awaiting_q = []
+internal_q = Queue()
-incoming_q = Queue()
 app = Flask(__name__)
 
 @app.route("/conjurer", methods=["POST"])
 def answer_external_command():
-    """
-    The function `answer_external_command` logs the request data, loads the data as JSON, logs the
-    record, and then puts the record into an incoming queue before returning a success message.
-    :return: The function `answer_external_command()` is returning a JSON response with the message
-    "SUCCESS".
-    """
-    app.logger.info(request)
     record = json.loads(request.data)
     app.logger.info(record)
     app.logger.info("DATA RECEIVED")
-    incoming_q.put(record)
+
+    
+    while True:
+        try:
+            q_data = internal_q.get(block=False)
+        except Empty:
+            break
+    if q_data.uuid in record:
+        pass
+
     return jsonify("SUCCESS")
 
 @app.route("/conjurer", methods=["GET"])
 def check_alive():
-    """
-    The function "check_alive" returns a JSON response with the message "ALIVE" when the "/conjurer"
-    route is accessed via a GET request.
-    :return: The code snippet is a Flask route that listens for GET requests to the "/conjurer"
-    endpoint. When a GET request is made to this endpoint, the function check_alive() is called, which
-    returns a JSON response with the message "ALIVE".
-    """
     return jsonify("ALIVE")
 
 def flask_debug(_logger):
@@ -59,58 +52,19 @@ def waitress_run(_logger):
     serve(app, host=HOST_ADDRESS, port=PORT_ADDRESS)
 
 def scan_queue(_logger):
-    """
-    The function `scan_queue` reads data from a queue, logs it, and appends it to another queue.
-
-    :param _logger: The `_logger` parameter is typically an instance of a logging object that is used to
-    record and store log messages. It is commonly used to track the flow of the program, record errors,
-    and provide information for debugging purposes. In this code snippet, the `_logger` object is used
-    to log the
-    """
     while True:
         data = OUT_COMM_Q.get()
         _logger.info(data)
-        awaiting_q.append(data)
+        internal_q.put(data)
-
+        query_list.append(data)
-def scan_incoming(_logger):
-    """
-    The `scan_incoming` function continuously checks for incoming data, processes it, and logs when data
-    is found.
-
-    :param _logger: The `_logger` parameter in the `scan_incoming` function is a logger object that is
-    used to log messages or information during the execution of the function. It is typically used for
-    debugging, monitoring, or tracking the flow of the program. In this case, the `_logger` is being
-    used
-    """
-    while True:
-        try:
-            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(record)
-        except Empty:
-            time.sleep(1)
-
 
 def comm_subroutine(logger):
-    """
-    The `comm_subroutine` function starts multiple threads to run different tasks concurrently.
-
-    :param logger: The `logger` parameter in the `comm_subroutine` function is an instance of a logger
-    object that is used for logging messages at various levels (e.g., debug, info, warning, error). In
-    the provided code snippet, the logger is used to log messages at the "info" level
-    """
     #logger.setLevel(logging.DEBUG)
     logger.info("Started")
     threads = []
-    #threads.append(threading.Thread(target=flask_debug, args=(logger,)))
+    threads.append(threading.Thread(target=flask_debug, args=(logger,)))
-    threads.append(threading.Thread(target=waitress_run, args=(logger,)))
+    #threads.append(threading.Thread(target=waitress_run, args=(logger,)))
     threads.append(threading.Thread(target=scan_queue,args=(logger,)))
-    threads.append(threading.Thread(target=scan_incoming,args=(logger,)))
-
 
     for worker in threads:
         worker.start()

conjurer_librarian/conjurer_librarian.py

@@ -1,27 +1,29 @@
-import re
+import asyncio
+import json
 import logging
+import netrc
+import re
 import threading
 import time
-from flask import Flask, jsonify, request
-import netrc
-import json
-import asyncio
 from json.decoder import JSONDecodeError
+from queue import Queue
+from typing import Callable
 from urllib.request import urlopen
+from uuid import UUID
+
+import requests
+import search_bot
+from flask import Flask, jsonify, request
 from habanero import Crossref
 from waitress import serve
-from queue import Queue
+
-import search_bot
-import requests
-from typing import Callable
-from uuid import UUID
 NETRC_FILE = r"C:\Users\Activcom.pl\.netrc"
 
 HOST_ADDRESS = "192.168.1.192"
 PORT_ADDRESS = 5001
 MAIN_BOT_ADDRESS = "http://192.168.1.191:5000"
 SEND_RESULTS = "/conjurer"
-BDSM_UUID_TEST = '96b7f85a-1142-4908-8986-62a2ea25a147'
+BDSM_UUID_TEST = "96b7f85a-1142-4908-8986-62a2ea25a147"
 
 ENCODING = "utf-8"
 app = Flask(__name__)
@@ -29,6 +31,7 @@ app = Flask(__name__)
 librarian_queue = Queue()
 librarian_list = []
 
+
 class Librarian(object):
 
     def __init__(self, app, query, uuid) -> None:
@@ -49,25 +52,25 @@ class Librarian(object):
 
     async def search_crossref(self, query):
         self.app.logger.info("STARTED SEARCH")
-        result = self.cr.works(query = query, limit = 1000)
+        result = self.cr.works(query=query, limit=1000)
         self.search_result_from_cr.update(result)
-        self.total = result['message']['total-results']
+        self.total = result["message"]["total-results"]
-        self.fetched += len(result['message']['items'])
+        self.fetched += len(result["message"]["items"])
-        self.logger.info (self.total)
+        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)
+            result = self.cr.works(query=query, limit=1000)
             self.search_result_from_cr.update(result)
-            self.total = result['message']['total-results']
+            self.total = result["message"]["total-results"]
-            self.fetched += len(result['message']['items'])
+            self.fetched += len(result["message"]["items"])
-            self.logger.info (self.total)
+            self.logger.info(self.total)
             self.logger.info(self.fetched)
 
             time.sleep(1)
         self.app.logger.info("CROSSREF DONE")
-        #TODO: add to sql with UUID
+        # TODO: add to sql with UUID
-        #sql row - title, doi, author, uuid, last retrieved, is_available
+        # sql row - title, doi, author, uuid, last retrieved, is_available
-        
+
         with open("rr_results.json", "r+", encoding="utf-8") as data_file:
             # First we load existing data into a dict.
             try:
@@ -76,18 +79,34 @@ class Librarian(object):
                 file_data = {}
             summarized_results = []
             self.app.logger.info("REFINE: Removing all derived works from the list")
-            for item in self.search_result_from_cr['message']['items']:
+            for item in self.search_result_from_cr["message"]["items"]:
                 container = "NO"
                 if "container-title" in item:
                     container = "YES"
                 else:
-                    summarized_results.append({"DOI" : item['DOI'], "title": item['title'] if 'title' in item else None,"type": item['type'] if 'type' in item else None, "container": container})
+                    summarized_results.append(
-            result = {self.uuid : {"total_results": self.search_result_from_cr['message']['total-results'], "on_page" : 1, "summary":summarized_results, "results":self.search_result_from_cr['message']['items']}}
+                        {
+                            "DOI": item["DOI"],
+                            "title": item["title"] if "title" in item else None,
+                            "type": item["type"] if "type" in item else None,
+                            "container": container,
+                        }
+                    )
+            result = {
+                self.uuid: {
+                    "total_results": self.search_result_from_cr["message"][
+                        "total-results"
+                    ],
+                    "on_page": 1,
+                    "summary": summarized_results,
+                    "results": self.search_result_from_cr["message"]["items"],
+                }
+            }
             if file_data:
                 file_data.update(result)
             else:
                 file_data = result
-            
+
             self.app.logger.info("REFINE: Dumping to file")
             data_file.truncate(0)
             data_file.seek(0)
@@ -96,7 +115,9 @@ class Librarian(object):
 
     async def check_dois_in_local_db(self, doi):
         self.app.logger.info("REFINE: Running search in the backend app")
-        coro = asyncio.to_thread(search_bot.search_for_doi, doi, self.live_results, self.app.logger)
+        coro = asyncio.to_thread(
+            search_bot.search_for_doi, doi, self.live_results, self.app.logger
+        )
         result = await coro
         return result
 
@@ -109,25 +130,34 @@ class Librarian(object):
             data = response.read()
             text = data.decode("utf-8")
             for line in text.splitlines():
-                if re.match(r".*Unfortunately, Sci-Hub doesn't have the requested document.*", line):
+                if re.match(
+                    r".*Unfortunately, Sci-Hub doesn't have the requested document.*",
+                    line,
+                ):
                     return False
-                if m := re.match(r".*<embed type=\"application.pdf\"\s*src=\"(.*\.pdf)",line):
+                if m := re.match(
+                    r".*<embed type=\"application.pdf\"\s*src=\"(.*\.pdf)", line
+                ):
                     direct_download_link = "https:" + str(m.group(1))
-                    self.app.logger.info (direct_download_link)
+                    self.app.logger.info(direct_download_link)
                     return True
         return False
 
-    async def check_if_exists(self, doi, brute_force = False):
+    async def check_if_exists(self, doi, brute_force=False):
         result = {}
         result = await self.check_dois_in_local_db(doi)
         if brute_force and not result:
             for item in doi:
                 item_link = "https://sci-hub.se/" + item[0]
-                tmp = {"DOI" : item["DOI"], "exists" : await self.check_if_exists_brute_force(item_link), "data": item}
+                tmp = {
+                    "DOI": item["DOI"],
+                    "exists": await self.check_if_exists_brute_force(item_link),
+                    "data": item,
+                }
                 result.update(tmp)
         return result
 
-    async def refine_query(self, unrefined_reqult, brute_force = False):
+    async def refine_query(self, unrefined_reqult, brute_force=False):
         temp = []
         refined_result = []
         for key in unrefined_reqult:
@@ -135,7 +165,7 @@ class Librarian(object):
             self.logger.info(key)
 
         for item in unrefined_reqult[self.uuid]["summary"]:
-            if item["container"] == "NO" and item["title"]:                
+            if item["container"] == "NO" and item["title"]:
                 refined_result.append(item)
 
         for item in refined_result:
@@ -149,20 +179,21 @@ class Librarian(object):
         refined_result = temp
         self.hit = len(refined_result)
         return refined_result
-    #TODO: DOłożyć sprawdzenie czy w rafinowanym pliku już nie mamy częściowego wyniku
+
+    # TODO: DOłożyć sprawdzenie czy w rafinowanym pliku już nie mamy częściowego wyniku
     async def answer_query(self):
-        #TODO: DOłożyć sprawdzenie czy w rafinowanym pliku już nie mamy częściowego wyniku tutaj bo zanim w ogóle otworzymy nierafinowany
+        # 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
+        # Search sql for UUID
-        #SQL SELECT * FROM RESULTS WHERE UUID = uuid
+        # SQL SELECT * FROM RESULTS WHERE UUID = uuid
         self.logger.info(f"Search started {self.uuid}")
         uuid_found = False
         database = None
         query = self.query
         with open("cr_results.json", "r+", encoding="utf-8") as cr_file:
-            #tu logika komunikacji z SQL i cała logika związana z wyszukaniem
+            # tu logika komunikacji z SQL i cała logika związana z wyszukaniem
-            #ale tymczasowo plik
+            # ale tymczasowo plik
             try:
-                database =  json.load(cr_file)
+                database = json.load(cr_file)
             except JSONDecodeError:
                 pass
 
@@ -175,7 +206,7 @@ class Librarian(object):
                 database.update(answer)
                 cr_file.truncate(0)
                 cr_file.seek(0)
-                json.dump(database,cr_file)
+                json.dump(database, cr_file)
                 self.result = await self.refine_query(answer)
                 return self.result
             else:
@@ -183,13 +214,14 @@ class Librarian(object):
                 database = answer
                 cr_file.truncate(0)
                 cr_file.seek(0)
-                json.dump(database,cr_file)
+                json.dump(database, cr_file)
                 self.result = await self.refine_query(answer)
                 self.app.logger.info("Refined")
                 self.done = True
                 return self.result
 
-#============================= FLASK INTERNALS===============================
+
+# ============================= FLASK INTERNALS===============================
 def flask_debug():
     """
     The `flask_debug` function starts a Flask application in debug mode without using the reloader.
@@ -198,6 +230,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"
@@ -205,6 +238,7 @@ def waitress_run():
     """
     serve(app, host=HOST_ADDRESS, port=PORT_ADDRESS)
 
+
 class BackgroundTaskSearch(threading.Thread):
     def run(self):
         loop = asyncio.new_event_loop()  # loop = asyncio.get_event_loop()
@@ -221,7 +255,7 @@ class BackgroundTaskSearch(threading.Thread):
             self.app.logger.info("Saving to file")
             with open("s_results.json", "r+", encoding="utf-8") as s_file:
                 try:
-                    database =  json.load(s_file)
+                    database = json.load(s_file)
                 except JSONDecodeError:
                     pass
                 if database:
@@ -236,17 +270,18 @@ class BackgroundTaskSearch(threading.Thread):
 
             self.app.logger.info(result)
             coroutine = asyncio.to_thread(
-            requests.post,
+                requests.post,
-            f"{MAIN_BOT_ADDRESS}{SEND_RESULTS}",
+                f"{MAIN_BOT_ADDRESS}{SEND_RESULTS}",
-            json=result,
+                json=result,
-            timeout=360,
+                timeout=360,
-    )       
+            )
             self.app.logger.info("SENT")
             _ = await coroutine
             self.app.logger.info("SEND CONFIRMED")
             time.sleep(1)
-            
+
-#==================================SERVER ROUTES==========================================
+
+# ==================================SERVER ROUTES==========================================
 @app.route("/query", methods=["POST"])
 async def query_database():
     record = json.loads(request.data)
@@ -254,8 +289,8 @@ async def query_database():
     app.logger.info(record["query"])
     app.logger.info(record["UUID"])
     uuid = record["UUID"]
-    #TODO: TESTING ONLY======================
+    # TODO: TESTING ONLY======================
-    uuid = UUID('{12345678-1234-5678-1234-567812345678}')
+    uuid = UUID("{12345678-1234-5678-1234-567812345678}")
 
     cl = Librarian(app, record["query"], uuid)
     librarian_queue.put(cl)
@@ -267,6 +302,7 @@ async def query_database():
     )
     return return_data
 
+
 @app.route("/get_partial_result", methods=["POST"])
 async def get_partial():
     record = json.loads(request.data)
@@ -282,12 +318,13 @@ async def get_partial():
     )
     return return_data
 
-#=======================================MAIN===================================================
+
+# =======================================MAIN===================================================
 if __name__ == "__main__":
-    logger = logging.getLogger('conjurer_musician')
+    logger = logging.getLogger("conjurer_musician")
     logger.setLevel(logging.DEBUG)
     threads = []
-    #threads.append(threading.Thread(target=waitress_run))
+    # threads.append(threading.Thread(target=waitress_run))
     threads.append(threading.Thread(target=flask_debug))
     bgtask = BackgroundTaskSearch()
     bgtask.app = app
@@ -296,7 +333,7 @@ if __name__ == "__main__":
     for worker in threads:
         try:
             logger.info(f"App number: {i}")
-            i+=1
+            i += 1
             worker.start()
         except RuntimeError as e:
             logger.error("Exploded")

conjurer_musician/conjurer_musician.py

@@ -1,20 +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 logging import handlers
+from pathlib import Path
+from platform import uname
 from sys import platform
-import logging
-from flask import Flask, jsonify, request
-from waitress import serve
 
+from flask import Flask, jsonify, redirect, request, send_from_directory
+from waitress import serve
 
 HOST_ADDRESS = "192.168.1.15"
 PORT_ADDRESS = 5000
@@ -26,24 +28,42 @@ if platform in ("linux", "linux2"):
         NETRC_FILE = "/home/mtuszowski/.netrc"
         LOGSTORE = "/home/mtuszowski/conjurer/logs/"
         ENCODING = "utf-8"
-        GRAPHICS_PATH = "/home/mtuszowski/conjurer/Conjurer_graphics/"
 
     else:
         LOGFILE = "/home/pi/Conjurer/discord_mus_service.log"
-        MEMORY_FIVE_SIARA = "/home/pi/Conjurer/pamiec.json"
-        SYSTEM_GPT_SETTINGS = "/home/pi/Conjurer/system_gpt_settings.json"
-        MEMORY_FIVE_MUZYKA = "/home/pi/Conjurer/pamiec_muzyki.json"
-        MUSIC_FOLDER = "/home/pi/RetroPie/mp3/"
-        SETTINGS_FILE = "/home/pi/Conjurer/settings.json"
         NETRC_FILE = "/home/pi/.netrc"
         LOGSTORE = "/home/pi/RetroPie/logs/"
-        ACCIDENT_LOG = "/home/pi/Conjurer/accident_log.json"
         ENCODING = "utf-8"
-        GRAPHICS_PATH = "/home/pi/RetroPie/Conjurer_graphics/"
+        MUSIC_FOLDER = "/home/pi/RetroPie/mp3/"
-        DIR_PATH_SADOX = "/home/pi/RetroPie/Fansadox/"
 
 
 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,
@@ -55,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():
     """
@@ -63,14 +91,31 @@ def thread_rescan():
     """
     logging.info("Starting filesystemupdater")
     while True:
-        time.sleep(60*60*24)
+        time.sleep(60 * 60 * 24)
         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 = []
 
@@ -84,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)
@@ -124,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 + ".*"
@@ -139,26 +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)])
-        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.truncate(0)
+                for item in return_list:
+                    s_file.write(item[1] + "\n")
+    return return_list
+
 
 def max_weight(lista):
     """
@@ -188,6 +250,47 @@ def remove_characters(string, character):
     return string.replace(character, "")
 
 
+@app.route("/stream", methods=["GET"])
+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`.
+    """
+    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"])
 def get_music_list():
     """
@@ -218,6 +321,7 @@ def update_music_list():
     )
     return return_data
 
+
 @app.route("/get_music", methods=["POST"])
 def look_for_playlist():
     """
@@ -234,7 +338,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),
@@ -251,6 +379,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"
@@ -258,12 +387,27 @@ 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"
+    )
+    handler = handlers.RotatingFileHandler(
+        filename=LOGFILE,
+        encoding=ENCODING,
+        mode="a",
+        maxBytes=6 * 1024 * 1024,
+        backupCount=6,
+    )
+    handler.setFormatter(formatter)
+    logger.addHandler(handler)
+
     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))
 
@@ -272,5 +416,3 @@ if __name__ == "__main__":
 
     for worker in threads:
         worker.join()
-
-#TODO: Inne pliki - sadox, dokumenty naukowe itp.

conjurer_musician/conjurer_musician.service

@@ -0,0 +1,11 @@
+[Unit]
+Description=Conjurer_musician
+After=multi-user.target
+
+[Service]
+Type=simple
+ExecStart=/home/pi/Conjurer/env/bin/python3 /home/pi/Conjurer/conjurer_musician.py
+Restart=on-abort
+
+[Install]
+WantedBy=multi-user.target

conjurer_musician/radio_conjurer.liq

@@ -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=[7000, 100], [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)
+
+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.
+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)
+
+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)

conjurer_musician/radio_service.service

@@ -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

deploy_music.sh

@@ -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

deploy_radio.sh

@@ -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

file_webservice/conjurer_musician.service

@@ -1,11 +0,0 @@
-[Unit]
-Description=Conjurer_musician
-After=multi-user.target
-
-[Service]
-Type=simple
-ExecStart=/home/pi/Conjurer-service/conjurer/file_webservice/bin/python3 /home/pi/Conjurer-service/conjurer/file_webservice/conjurer_musician.py
-Restart=on-abort
-
-[Install]
-WantedBy=multi-user.target

file_webservice/install_musician_service.sh

@@ -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

install_main_bot.sh

@@ -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 start conjurer.service
-sudo systemctl enable conjurer_musician.service
+sudo systemctl enable conjurer.service

install_music_bot.sh

@@ -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