bump obsws-python version

minor bump

README.md

@@ -28,7 +28,18 @@ pipx install simple-recorder
 
 *with pyz*
 
-An executable pyz has been included in [Releases](https://github.com/onyx-and-iris/simple-recorder/releases) which you can run in Windows. Follow the steps in this [Setting up Windows for Zipapps](https://jhermann.github.io/blog/python/deployment/2020/02/29/python_zippapps_on_windows.html#Setting-Up-Windows-10-for-Zipapps) guide.
+-   Download the pyz file in [Releases](https://github.com/onyx-and-iris/simple-recorder/releases)
+-   Optional step: for automatic discovery of the pyz file follow this guide on [Setting Up Windows for Zippapps](https://jhermann.github.io/blog/python/deployment/2020/02/29/python_zippapps_on_windows.html#Setting-Up-Windows-10-for-Zipapps)
+
+Finally run the pyz with python (CLI)/pythonw (GUI):
+
+```console
+python simple-recorder.pyz <subcommand>
+
+pythonw simple-recorder.pyz
+```
+
+note, the pyz extension won't be required if you followed the optional step and made it discoverable.
 
 ## Configuration
 
@@ -51,7 +62,7 @@ OBS_THEME=Reds
 
 ### CLI
 
-To launch the CLI pass any subcommand, for example:
+To launch the CLI:
 
 ```console
 simple-recorder start "File Name"
@@ -83,10 +94,10 @@ Usage: simple-recorder [OPTIONS] COMMAND
 
 ### GUI
 
-To launch the GUI run the root command without any subcommands:
+To launch the GUI:
 
 ```console
-simple-recorder
+simple-recorder-gui
 ```
 
 ![simple-recorder](./img/simple-recorder.png)
@@ -98,7 +109,7 @@ Just enter the filename and click *Start*.
 You can change the colour theme with the --theme option:
 
 ```console
-simple-recorder --theme="Light Purple"
+simple-recorder-gui --theme="Light Purple"
 ```
 
 [obs-studio]: https://obsproject.com/

pdm.lock

@@ -5,7 +5,7 @@
 groups = ["default", "build"]
 strategy = ["inherit_metadata"]
 lock_version = "4.5.0"
-content_hash = "sha256:292c5ea319597e3539895c1ac50004c884c5d46edd5f7b195ede79156558feab"
+content_hash = "sha256:e744505d4be91a30830dd1d57d956a6c8775ea75385351b3f4c0d29faddd9ce3"
 
 [[metadata.targets]]
 requires_python = ">=3.11"
@@ -63,7 +63,7 @@ files = [
 
 [[package]]
 name = "obsws-python"
-version = "1.7.2"
+version = "1.8.0"
 requires_python = ">=3.9"
 summary = "A Python SDK for OBS Studio WebSocket v5.0"
 groups = ["default"]
@@ -72,8 +72,8 @@ dependencies = [
     "websocket-client",
 ]
 files = [
-    {file = "obsws_python-1.7.2-py3-none-any.whl", hash = "sha256:acda31852ad9d7165de915b0603c13f6df527d3f61619970bf5fb562e300bc85"},
+    {file = "obsws_python-1.8.0-py3-none-any.whl", hash = "sha256:537bde416e149b6f59e0b2f31761d4a40329feafec171bde6fc1346ab8516e28"},
-    {file = "obsws_python-1.7.2.tar.gz", hash = "sha256:b5cdaad30fbe1f6d4787b6530048b9882f070c3ee7830abb6dad4a47f84d7fa0"},
+    {file = "obsws_python-1.8.0.tar.gz", hash = "sha256:e082894f80deb0836861fdc3c222e497308c8f66328da6075baba5b456a20971"},
 ]
 
 [[package]]

pyproject.toml

@@ -1,12 +1,12 @@
 [project]
 name = "simple-recorder"
-version = "0.3.1"
+version = "0.4.0"
 description = "A simple OBS recorder"
 authors = [{ name = "onyx-and-iris", email = "code@onyxandiris.online" }]
 dependencies = [
     "clypi>=1.8.1",
     "FreeSimpleGUI>=5.2.0.post1",
-    "obsws-python>=1.7.2",
+    "obsws-python>=1.8.0",
 ]
 requires-python = ">=3.11"
 readme = "README.md"
@@ -15,6 +15,9 @@ license = { text = "MIT" }
 [project.scripts]
 simple-recorder = "simple_recorder:run"
 
+[project.gui-scripts]
+simple-recorder-gui = "simple_recorder:run"
+
 [build-system]
 requires = ["pdm-backend"]
 build-backend = "pdm.backend"
@@ -28,6 +31,4 @@ compile = "shiv -c simple-recorder -o bin/simple-recorder.pyz ."
 
 
 [dependency-groups]
-build = [
+build = ["shiv>=1.0.8"]
-    "shiv>=1.0.8",
-]

src/simple_recorder/cli.py

@@ -8,6 +8,7 @@ from .errors import SimpleRecorderError
 from .gui import SimpleRecorderWindow
 from .pause import Pause
 from .resume import Resume
+from .split import Split
 from .start import Start
 from .stop import Stop
 
@@ -37,8 +38,11 @@ def theme_parser(value: str) -> str:
     return value
 
 
+SUBCOMMANDS = Start | Stop | Pause | Resume | Split | Directory
+
+
 class SimpleRecorder(Command):
-    subcommand: Start | Stop | Pause | Resume | Directory | None = None
+    subcommand: SUBCOMMANDS | None = None
     host: str = arg(default="localhost", env="OBS_HOST", help="OBS WebSocket host")
     port: int = arg(default=4455, env="OBS_PORT", help="OBS WebSocket port")
     password: str | None = arg(
@@ -52,7 +56,6 @@ class SimpleRecorder(Command):
     )
     debug: bool = arg(
         default=False,
-        env="DEBUG",
         help="Enable debug logging",
         hidden=True,
     )

src/simple_recorder/directory.py

@@ -21,7 +21,7 @@ class Directory(Command):
     async def run(self):
         try:
             with obsws.ReqClient(
-                host=self.host, port=self.port, password=self.password
+                host=self.host, port=self.port, password=self.password, timeout=3
             ) as client:
                 if self.directory:
                     client.set_record_directory(self.directory)
@@ -32,5 +32,5 @@ class Directory(Command):
                         f"Current recording directory: {highlight(resp.record_directory)}"
                     )
                     return resp.record_directory
-        except TimeoutError:
+        except (ConnectionRefusedError, TimeoutError):
             raise SimpleRecorderError("Failed to connect to OBS. Is it running?")

src/simple_recorder/gui.py

@@ -7,6 +7,7 @@ from .directory import Directory
 from .errors import SimpleRecorderError
 from .pause import Pause
 from .resume import Resume
+from .split import Split
 from .start import Start
 from .stop import Stop
 
@@ -31,6 +32,7 @@ class SimpleRecorderWindow(fsg.Window):
                 current_directory = resp.record_directory
         except (ConnectionRefusedError, TimeoutError):
             status_message = "Failed to connect to OBS. Is it running?"
+            current_directory = ""
 
         recorder_layout = [
             [fsg.Text("Enter recording filename:", key="-PROMPT-")],
@@ -93,6 +95,7 @@ class SimpleRecorderWindow(fsg.Window):
         self["Stop Recording"].bind("<Return>", " || RETURN")
         self["Pause Recording"].bind("<Return>", " || RETURN")
         self["Resume Recording"].bind("<Return>", " || RETURN")
+        self["Split Recording"].bind("<Return>", " || RETURN")
 
         self["-FILENAME-"].bind("<KeyPress>", " || KEYPRESS")
         self["-FILENAME-"].update(select=True)
@@ -102,6 +105,9 @@ class SimpleRecorderWindow(fsg.Window):
         self["Add Chapter"].bind("<Leave>", " || LEAVE")
         self["Add Chapter"].bind("<Button-3>", " || RIGHT_CLICK")
 
+        self["-GET-CURRENT-"].bind("<Return>", " || RETURN")
+        self["-UPDATE-"].bind("<Return>", " || RETURN")
+
     async def run(self):
         while True:
             event, values = self.read()
@@ -173,6 +179,19 @@ class SimpleRecorderWindow(fsg.Window):
                     else:
                         self["-OUTPUT-RECORDER-"].update("", text_color="white")
 
+                case ["Split Recording"] | ["Split Recording", "RETURN"]:
+                    try:
+                        await Split(
+                            host=self.host, port=self.port, password=self.password
+                        ).run()
+                        self["-OUTPUT-RECORDER-"].update(
+                            "Recording split successfully", text_color="green"
+                        )
+                    except SimpleRecorderError as e:
+                        self["-OUTPUT-RECORDER-"].update(
+                            f"Error: {e.raw_message}", text_color="red"
+                        )
+
                 case ["Add Chapter", "RIGHT_CLICK"]:
                     _ = fsg.popup_get_text(
                         "Enter chapter name:",
@@ -180,12 +199,12 @@ class SimpleRecorderWindow(fsg.Window):
                         default_text="unnamed",
                     )
 
-                case ["Split Recording" | "Add Chapter"]:
+                case ["Add Chapter"]:
                     self["-OUTPUT-RECORDER-"].update(
                         "This feature is not implemented yet", text_color="orange"
                     )
 
-                case ["-GET-CURRENT-"]:
+                case ["-GET-CURRENT-"] | ["-GET-CURRENT-", "RETURN"]:
                     try:
                         current_directory = await Directory(
                             host=self.host, port=self.port, password=self.password
@@ -196,7 +215,7 @@ class SimpleRecorderWindow(fsg.Window):
                             f"Error: {e.raw_message}", text_color="red"
                         )
 
-                case ["-UPDATE-"]:
+                case ["-UPDATE-"] | ["-UPDATE-", "RETURN"]:
                     filepath = values["-FILEPATH-"]
                     if not filepath:
                         self["-OUTPUT-SETTINGS-"].update(

src/simple_recorder/pause.py

@@ -26,5 +26,5 @@ class Pause(Command):
 
                 client.pause_record()
                 print("Recording paused successfully.")
-        except TimeoutError:
+        except (ConnectionRefusedError, TimeoutError):
             raise SimpleRecorderError("Failed to connect to OBS. Is it running?")

src/simple_recorder/resume.py

@@ -26,5 +26,5 @@ class Resume(Command):
 
                 client.resume_record()
                 print("Recording resumed successfully.")
-        except TimeoutError:
+        except (ConnectionRefusedError, TimeoutError):
             raise SimpleRecorderError("Failed to connect to OBS. Is it running?")

src/simple_recorder/split.py

@@ -0,0 +1,40 @@
+import logging
+
+import obsws_python as obsws
+from clypi import Command, arg
+from typing_extensions import override
+
+from .errors import SimpleRecorderError
+
+logging.basicConfig(level=logging.disable())
+
+
+class Split(Command):
+    """Split the current recording into a new file."""
+
+    host: str = arg(inherited=True)
+    port: int = arg(inherited=True)
+    password: str = arg(inherited=True)
+
+    @override
+    async def run(self):
+        """Run the split command."""
+        try:
+            with obsws.ReqClient(
+                host=self.host, port=self.port, password=self.password, timeout=3
+            ) as client:
+                resp = client.get_record_status()
+                if not resp.output_active:
+                    raise SimpleRecorderError("No active recording to split.")
+
+                client.split_record_file()
+                print("Recording split successfully.")
+        except (ConnectionRefusedError, TimeoutError):
+            raise SimpleRecorderError("Failed to connect to OBS. Is it running?")
+        except obsws.error.OBSSDKRequestError as e:
+            if e.code == 702:
+                raise SimpleRecorderError(
+                    "Unable to split file, please check your OBS settings."
+                )
+            else:
+                raise SimpleRecorderError(f"Error: {e.code} - {e.message}")

src/simple_recorder/start.py

@@ -45,5 +45,5 @@ class Start(Command):
                 )
                 client.start_record()
                 print(f"Recording started with filename: {highlight(filename)}")
-        except TimeoutError:
+        except (ConnectionRefusedError, TimeoutError):
             raise SimpleRecorderError("Failed to connect to OBS. Is it running?")

src/simple_recorder/stop.py

@@ -3,7 +3,6 @@ from clypi import Command, arg
 from typing_extensions import override
 
 from .errors import SimpleRecorderError
-from .styler import highlight
 
 
 class Stop(Command):
@@ -24,6 +23,6 @@ class Stop(Command):
                     raise SimpleRecorderError("Recording is not active.")
 
                 client.stop_record()
-                print(highlight("Recording stopped successfully."))
+                print("Recording stopped successfully.")
-        except TimeoutError:
+        except (ConnectionRefusedError, TimeoutError):
             raise SimpleRecorderError("Failed to connect to OBS. Is it running?")