README.md

@@ -28,18 +28,7 @@ pipx install simple-recorder
 
 *with pyz*
 
--   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.
+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.
 
 ## Configuration
 
@@ -62,7 +51,7 @@ OBS_THEME=Reds
 
 ### CLI
 
-To launch the CLI:
+To launch the CLI pass any subcommand, for example:
 
 ```console
 simple-recorder start "File Name"
@@ -94,10 +83,10 @@ Usage: simple-recorder [OPTIONS] COMMAND
 
 ### GUI
 
-To launch the GUI:
+To launch the GUI run the root command without any subcommands:
 
 ```console
-simple-recorder-gui
+simple-recorder
 ```
 
 ![simple-recorder](./img/simple-recorder.png)
@@ -109,7 +98,7 @@ Just enter the filename and click *Start*.
 You can change the colour theme with the --theme option:
 
 ```console
-simple-recorder-gui --theme="Light Purple"
+simple-recorder --theme="Light Purple"
 ```
 
 [obs-studio]: https://obsproject.com/

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "simple-recorder"
-version = "0.3.5"
+version = "0.3.1"
 description = "A simple OBS recorder"
 authors = [{ name = "onyx-and-iris", email = "code@onyxandiris.online" }]
 dependencies = [
@@ -15,9 +15,6 @@ 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"
@@ -31,4 +28,6 @@ compile = "shiv -c simple-recorder -o bin/simple-recorder.pyz ."
 
 
 [dependency-groups]
-build = ["shiv>=1.0.8"]
+build = [
+    "shiv>=1.0.8",
+]

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, timeout=3
+                host=self.host, port=self.port, password=self.password
             ) 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 (ConnectionRefusedError, TimeoutError):
+        except TimeoutError:
             raise SimpleRecorderError("Failed to connect to OBS. Is it running?")

src/simple_recorder/gui.py

@@ -31,7 +31,6 @@ 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-")],
@@ -103,9 +102,6 @@ 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()
@@ -189,7 +185,7 @@ class SimpleRecorderWindow(fsg.Window):
                         "This feature is not implemented yet", text_color="orange"
                     )
 
-                case ["-GET-CURRENT-"] | ["-GET-CURRENT-", "RETURN"]:
+                case ["-GET-CURRENT-"]:
                     try:
                         current_directory = await Directory(
                             host=self.host, port=self.port, password=self.password
@@ -200,7 +196,7 @@ class SimpleRecorderWindow(fsg.Window):
                             f"Error: {e.raw_message}", text_color="red"
                         )
 
-                case ["-UPDATE-"] | ["-UPDATE-", "RETURN"]:
+                case ["-UPDATE-"]:
                     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 (ConnectionRefusedError, TimeoutError):
+        except 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 (ConnectionRefusedError, TimeoutError):
+        except TimeoutError:
             raise SimpleRecorderError("Failed to connect to OBS. Is it running?")

src/simple_recorder/start.py

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

src/simple_recorder/stop.py

@@ -25,5 +25,5 @@ class Stop(Command):
 
                 client.stop_record()
                 print(highlight("Recording stopped successfully."))
-        except (ConnectionRefusedError, TimeoutError):
+        except TimeoutError:
             raise SimpleRecorderError("Failed to connect to OBS. Is it running?")