Tag: 1.24

Intermediate commits (oldest → newest):
- Merge branch 'main' of https://github.com/migatu/conjurer
- Merge branch 'main' of https://github.com/migatu/conjurer
- BGFX
- Function for idv3 and bugfix
- Merge branch 'main' of https://github.com/migatu/conjurer
- Logs additional
- LGFIX
- FIXED!
- Arguments added to the utility.
- Fix old bug
- add exception handling
- Literowka
- Hej hoppsan!
- Add comment
- Fixc Fixc
- Fixit
- Inside joke very boomer much wow
- Fixing logging issues in music_functions.py and other_functions.py
- Maybe this will fix
- test
- test
- another attempt to fix the bug
- Maybe this is the fix ?
- Maybe fix
This commit is contained in:
2025-10-30 16:59:19 +01:00
parent db48605849
commit f73fd703b7
44 changed files with 4437 additions and 1888 deletions
+112 -27
View File
@@ -1,28 +1,48 @@
import logging
import threading
import json
import logging
import re
import threading
import time
from queue import Queue, Empty
from queue import Empty, Queue
from urllib import request as urequest
from flask import Flask, jsonify, request
from waitress import serve
HOST_ADDRESS = "192.168.1.191"
PORT_ADDRESS = 5000
ICECAST_ADDRESS = "http://192.168.1.15:8000"
OUT_COMM_Q = Queue()
IN_COMM_Q = Queue()
SRCHTITLE = re.compile(rb"StreamTitle=\\*(?P<title>[^;]*);").search
awaiting_q = []
incoming_q = Queue()
app = Flask(__name__)
PREPPED_TRACKS = {
"requests": "",
"hit": "",
"all": "",
"priority": "",
"jingles": "",
"now_playing": "",
"next": "",
"meta": "",
}
logger = logging.getLogger("discord")
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:
def __init__(self, query_author, query_uuid, query_content, ctx) -> None:
self.author = query_author
self.uuid = query_uuid
self.content = query_content
self.logger = uplogger
self.logger = logging.getLogger("discord")
self.stop = False
self.ctx = ctx
self.logger.info(
@@ -30,6 +50,33 @@ class QueryControl:
)
self.replies = []
@app.route("/prepped_tracks", methods=["POST"])
def log_radio_tracks():
app.logger = logging.getLogger("discord")
app.logger.info(request)
record = json.loads(request.data)
app.logger.info(record)
if "next" in record[0]:
metadata = id3(ICECAST_ADDRESS)
PREPPED_TRACKS["now_playing"] = PREPPED_TRACKS["next"]
if metadata:
PREPPED_TRACKS["meta"] = (
metadata["name"]
+ " - "
+ metadata["title"]
+ "("
+ metadata["genre"]
+ ")"
)
else:
PREPPED_TRACKS["meta"] = "Nie znaju"
PREPPED_TRACKS[record[0]] = record[1]
app.logger.info("DATA RECEIVED")
return jsonify("SUCCESS")
@app.route("/conjurer", methods=["POST"])
def answer_external_command():
"""
@@ -38,13 +85,15 @@ def answer_external_command():
:return: The function `answer_external_command()` is returning a JSON response with the message
"SUCCESS".
"""
app.logger.info(request)
logger = logging.getLogger("discord")
logger.info(request)
record = json.loads(request.data)
app.logger.info(record)
app.logger.info("DATA RECEIVED")
logger.info(record)
logger.info("DATA RECEIVED")
incoming_q.put(record)
return jsonify("SUCCESS")
@app.route("/conjurer", methods=["GET"])
def check_alive():
"""
@@ -56,25 +105,31 @@ def check_alive():
"""
return jsonify("ALIVE")
def flask_debug(_logger):
def flask_debug():
"""
The `flask_debug` function starts a Flask application in debug mode without using the reloader.
Do not use for production for fucks sake.
"""
_logger.info("Attempt debug")
logger = logging.getLogger("discord")
logger.info("Attempt debug")
# trunk-ignore(bandit/B201)
app.run(debug=True, use_reloader=False, host=HOST_ADDRESS, port=PORT_ADDRESS)
def waitress_run(_logger):
def waitress_run():
"""
The `waitress_run` function serves the `app` on host "0.0.0.0"
and port 5000 using the Waitress WSGI server.
"""
_logger.info("Attempt waitress")
logger = logging.getLogger("discord")
logger.info("Attempt waitress")
serve(app, host=HOST_ADDRESS, port=PORT_ADDRESS)
def scan_queue(_logger):
def scan_queue():
"""
The function `scan_queue` reads data from a queue, logs it, and appends it to another queue.
@@ -83,12 +138,14 @@ def scan_queue(_logger):
and provide information for debugging purposes. In this code snippet, the `_logger` object is used
to log the
"""
logger = logging.getLogger("discord")
while True:
data = OUT_COMM_Q.get()
_logger.info(data)
logger.info(data)
awaiting_q.append(data)
def scan_incoming(_logger):
def scan_incoming():
"""
The `scan_incoming` function continuously checks for incoming data, processes it, and logs when data
is found.
@@ -98,10 +155,11 @@ def scan_incoming(_logger):
debugging, monitoring, or tracking the flow of the program. In this case, the `_logger` is being
used
"""
logger = logging.getLogger("discord")
while True:
try:
answer = incoming_q.get(block=False)
_logger.info("DATA FOUND")
logger.info("DATA FOUND")
record_stored = False
for record in awaiting_q:
if record.uuid in answer.keys():
@@ -111,7 +169,7 @@ def scan_incoming(_logger):
IN_COMM_Q.put(record)
if not record_stored:
for key in answer.keys():
record = QueryControl("Orphaned", key, "Orphan", _logger, None)
record = QueryControl("Orphaned", key, "Orphan", None)
record.stop = True
record.entries = answer[record.uuid]
IN_COMM_Q.put(record)
@@ -119,7 +177,34 @@ def scan_incoming(_logger):
time.sleep(1)
def comm_subroutine(logger):
def get_stream_title(tag: bytes) -> str:
title = ""
if m := SRCHTITLE(tag):
# decode, strip, unescape and remove surrounding quotes (may not even be the same type of quote)
title = m.group("title").decode("utf-8").strip().replace("\\", "")[1:-1]
return title
def id3(url: str) -> dict:
request = urequest.Request(url, headers={"Icy-MetaData": 1})
with urequest.urlopen(request) as resp:
metaint = int(resp.headers.get("icy-metaint", "-1"))
if metaint < 0:
return False
resp.read(
metaint
) # this isn't seekable so, arbitrarily read to the point we want
tagdata = dict(
site_url=resp.headers.get("icy-url"),
name=resp.headers.get("icy-name").title(),
genre=resp.headers.get("icy-genre").title(),
title=get_stream_title(resp.read(255)),
)
return tagdata
def comm_subroutine():
"""
The `comm_subroutine` function starts multiple threads to run different tasks concurrently.
@@ -127,20 +212,20 @@ def comm_subroutine(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")
# logger.setLevel(logging.DEBUG)
logger = logging.getLogger("discord")
logger.info("Started comms")
threads = []
#threads.append(threading.Thread(target=flask_debug, 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,)))
# threads.append(threading.Thread(target=flask_debug))
threads.append(threading.Thread(target=waitress_run))
threads.append(threading.Thread(target=scan_queue))
threads.append(threading.Thread(target=scan_incoming))
for worker in threads:
worker.start()
for worker in threads:
worker.join()
if __name__ == "__main__":
logging_client = logging.getLogger(__name__)
comm_subroutine(logging_client)
comm_subroutine()