Compare commits

..

No commits in common. "0814678278f2770d6548100c197baf4aa3913901" and "bba2361964b1c93121c8d48a4176f3030fe34ee9" have entirely different histories.

3 changed files with 8 additions and 18 deletions

View File

@ -1,6 +1,6 @@
[project] [project]
name = "simple-recorder" name = "simple-recorder"
version = "0.1.7" version = "0.1.5"
description = "A simple OBS recorder" description = "A simple OBS recorder"
authors = [{ name = "onyx-and-iris", email = "code@onyxandiris.online" }] authors = [{ name = "onyx-and-iris", email = "code@onyxandiris.online" }]
dependencies = [ dependencies = [

View File

@ -47,19 +47,10 @@ class SimpleRecorder(Command):
env="OBS_THEME", env="OBS_THEME",
help=f"GUI theme ({', '.join(themes)})", help=f"GUI theme ({', '.join(themes)})",
) )
debug: bool = arg(
default=False,
env="DEBUG",
help="Enable debug logging",
hidden=True,
)
@override @override
async def run(self): async def run(self):
"""Run the Simple Recorder GUI.""" """Run the Simple Recorder GUI."""
if self.debug:
logging.basicConfig(level=logging.DEBUG)
window = SimpleRecorderWindow(self.host, self.port, self.password, self.theme) window = SimpleRecorderWindow(self.host, self.port, self.password, self.theme)
await window.run() await window.run()

View File

@ -1,8 +1,8 @@
import logging import logging
import FreeSimpleGUI as fsg import FreeSimpleGUI as fsg
from clypi import ClypiException
from .errors import SimpleRecorderError
from .start import Start from .start import Start
from .stop import Stop from .stop import Stop
@ -31,12 +31,11 @@ class SimpleRecorderWindow(fsg.Window):
async def run(self): async def run(self):
while True: while True:
event, values = self.read() event, values = self.read()
self.logger.debug(f"Event: {event}, Values: {values}")
if event == fsg.WIN_CLOSED: if event == fsg.WIN_CLOSED:
break break
match e := event.split(" || "): match event.split(" || "):
case ["Start Recording"] | ["Start Recording" | "-FILENAME-", "RETURN"]: case ["Start Recording", "RETURN" | None] | ["-FILENAME-", "RETURN"]:
try: try:
await Start( await Start(
filename=values["-FILENAME-"], filename=values["-FILENAME-"],
@ -47,12 +46,12 @@ class SimpleRecorderWindow(fsg.Window):
self["-OUTPUT-"].update( self["-OUTPUT-"].update(
"Recording started successfully", text_color="green" "Recording started successfully", text_color="green"
) )
except SimpleRecorderError as e: except ClypiException as e:
self["-OUTPUT-"].update( self["-OUTPUT-"].update(
f"Error: {e.raw_message}", text_color="red" f"Error: {e.raw_message}", text_color="red"
) )
case ["Stop Recording"] | ["Stop Recording", "RETURN"]: case ["Stop Recording", "RETURN" | None]:
try: try:
await Stop( await Stop(
host=self.host, port=self.port, password=self.password host=self.host, port=self.port, password=self.password
@ -60,12 +59,12 @@ class SimpleRecorderWindow(fsg.Window):
self["-OUTPUT-"].update( self["-OUTPUT-"].update(
"Recording stopped successfully", text_color="green" "Recording stopped successfully", text_color="green"
) )
except SimpleRecorderError as e: except ClypiException as e:
self["-OUTPUT-"].update( self["-OUTPUT-"].update(
f"Error: {e.raw_message}", text_color="red" f"Error: {e.raw_message}", text_color="red"
) )
case _: case _:
self.logger.warning(f"Unhandled event: {e}") self.logger.warning(f"Unhandled event: {event}")
self.close() self.close()