From c9eab2d2c0295ff160141d96b7fa9462b5807f80 Mon Sep 17 00:00:00 2001 From: evilchili Date: Tue, 5 Mar 2024 22:15:51 -0800 Subject: [PATCH] formatting updates --- croaker/cli.py | 6 +++--- croaker/controller.py | 7 ++++--- croaker/routes.py | 6 +++--- croaker/server.py | 28 +++++++++++++--------------- croaker/streamer.py | 34 ++++++++++++++-------------------- 5 files changed, 37 insertions(+), 44 deletions(-) diff --git a/croaker/cli.py b/croaker/cli.py index 682303a..b721ef3 100644 --- a/croaker/cli.py +++ b/croaker/cli.py @@ -11,9 +11,9 @@ from dotenv import load_dotenv from typing_extensions import Annotated import croaker.path -from croaker.server import server from croaker.exceptions import ConfigurationError from croaker.playlist import Playlist +from croaker.server import server SETUP_HELP = """ # Root directory for croaker configuration and logs. See also croaker --root. @@ -77,12 +77,12 @@ def main( load_dotenv(stream=io.StringIO(SETUP_HELP)) if debug is not None: if debug: - os.environ["DEBUG"] = '1' + os.environ["DEBUG"] = "1" else: del os.environ["DEBUG"] logging.basicConfig( - format='%(asctime)s - %(name)s - %(levelname)s - %(message)s', + format="%(asctime)s - %(name)s - %(levelname)s - %(message)s", level=logging.DEBUG if debug else logging.INFO, ) diff --git a/croaker/controller.py b/croaker/controller.py index 9c2ec0b..3221ecd 100644 --- a/croaker/controller.py +++ b/croaker/controller.py @@ -1,6 +1,7 @@ import logging -import threading import queue +import threading + from croaker.playlist import load_playlist from croaker.streamer import AudioStreamer @@ -24,14 +25,14 @@ class Controller(threading.Thread): def run(self): logging.debug("Starting AudioStreamer...") self.streamer.start() - self.load('session_start') + self.load("session_start") while True: data = self._control_queue.get() logging.debug(f"{data = }") self.process_request(data) def process_request(self, data): - cmd, *args = data.split(' ') + cmd, *args = data.split(" ") cmd = cmd.strip() if not cmd: return diff --git a/croaker/routes.py b/croaker/routes.py index e43dfb9..3f278e0 100644 --- a/croaker/routes.py +++ b/croaker/routes.py @@ -1,6 +1,6 @@ import logging -from bottle import route, abort +from bottle import abort, route from croaker import streamer @@ -27,5 +27,5 @@ def next_in_queue(): abort() track1 = pl.current controller.play_next() - tracke2 = controller.now_playing().current - return '\n'.join([str(track1), str(track2)]) + controller.now_playing().current + return "\n".join([str(track1), str(track2)]) diff --git a/croaker/server.py b/croaker/server.py index cd9452d..2ebd936 100644 --- a/croaker/server.py +++ b/croaker/server.py @@ -1,5 +1,5 @@ -import os import logging +import os import queue import socketserver from pathlib import Path @@ -7,17 +7,17 @@ from pathlib import Path import daemon from croaker import path -from croaker.pidfile import pidfile from croaker.controller import Controller +from croaker.pidfile import pidfile class RequestHandler(socketserver.StreamRequestHandler): supported_commands = { - 'PLAY': "$PLAYLIST_NAME - Switch to the specified playlist.", - 'FFWD': " - Skip to the next track in the playlist.", - 'HELP': " - Display command help.", - 'KTHX': " - Close the current connection.", - 'STOP': " - Stop Croaker.", + "PLAY": "$PLAYLIST_NAME - Switch to the specified playlist.", + "FFWD": " - Skip to the next track in the playlist.", + "HELP": " - Display command help.", + "KTHX": " - Close the current connection.", + "STOP": " - Stop Croaker.", } def handle(self): @@ -33,8 +33,8 @@ class RequestHandler(socketserver.StreamRequestHandler): if cmd not in self.supported_commands: self.send(f"ERR Unknown Command '{cmd}'") - if cmd == 'KTHX': - return self.send('KBAI') + if cmd == "KTHX": + return self.send("KBAI") handler = getattr(self, f"handle_{cmd}", None) if handler: @@ -43,16 +43,14 @@ class RequestHandler(socketserver.StreamRequestHandler): self.default_handler(cmd, args) def send(self, msg): - return self.wfile.write(msg.encode() + b'\n') + return self.wfile.write(msg.encode() + b"\n") def default_handler(self, cmd, args): self.server.tell_controller(f"{cmd} {args}") - return self.send('OK') + return self.send("OK") def handle_HELP(self, args): - return self.send('\n'.join( - f"{cmd} {txt}" for cmd, txt in self.supported_commands.items() - )) + return self.send("\n".join(f"{cmd} {txt}" for cmd, txt in self.supported_commands.items())) def handle_STOP(self, args): self.send("Shutting down.") @@ -75,7 +73,7 @@ class CroakerServer(socketserver.TCPServer): def daemonize(self) -> None: logging.info(f"Daemonizing controller; pidfile and output in {path.root()}") - super().__init__((os.environ['HOST'], int(os.environ['PORT'])), RequestHandler) + super().__init__((os.environ["HOST"], int(os.environ["PORT"])), RequestHandler) self._context.pidfile = self._pidfile() self._context.stdout = open(path.root() / Path("croaker.out"), "wb") diff --git a/croaker/streamer.py b/croaker/streamer.py index 078b5be..2ed14b8 100644 --- a/croaker/streamer.py +++ b/croaker/streamer.py @@ -1,14 +1,12 @@ -import os import logging +import os import threading -from pathlib import Path - from functools import cached_property +from pathlib import Path +from time import sleep import shout -from time import sleep - class AudioStreamer(threading.Thread): def __init__(self, queue, skip_event, stop_event): @@ -20,19 +18,15 @@ class AudioStreamer(threading.Thread): @cached_property def _shout(self): s = shout.Shout() - s.name = 'Croaker Radio' - s.url = os.environ['ICECAST_URL'] - s.mount = os.environ['ICECAST_MOUNT'] - s.host = os.environ['ICECAST_HOST'] - s.port = int(os.environ['ICECAST_PORT']) - s.password = os.environ['ICECAST_PASSWORD'] - s.protocol = 'http' - s.format = 'mp3' - s.audio_info = { - shout.SHOUT_AI_BITRATE: '192', - shout.SHOUT_AI_SAMPLERATE: '44100', - shout.SHOUT_AI_CHANNELS: '5' - } + s.name = "Croaker Radio" + s.url = os.environ["ICECAST_URL"] + s.mount = os.environ["ICECAST_MOUNT"] + s.host = os.environ["ICECAST_HOST"] + s.port = int(os.environ["ICECAST_PORT"]) + s.password = os.environ["ICECAST_PASSWORD"] + s.protocol = "http" + s.format = "mp3" + s.audio_info = {shout.SHOUT_AI_BITRATE: "192", shout.SHOUT_AI_SAMPLERATE: "44100", shout.SHOUT_AI_CHANNELS: "5"} return s def run(self): @@ -49,10 +43,10 @@ class AudioStreamer(threading.Thread): self._shout.close() def play(self, track: Path): - with track.open('rb') as fh: + with track.open("rb") as fh: self._shout.get_connected() logging.debug(f"Streaming {track.stem = }") - self._shout.set_metadata({'song': track.stem}) + self._shout.set_metadata({"song": track.stem}) input_buffer = fh.read(4096) while not self.skip_requested.is_set(): if self.stop_requested.is_set():