From d758db9dee575d3fc693c3ed28812f56b5cd3428 Mon Sep 17 00:00:00 2001 From: onyx-and-iris Date: Thu, 28 Sep 2023 16:32:52 +0100 Subject: [PATCH] lint/format fixes --- src/nvda_voicemeeter/cdll.py | 2 +- src/nvda_voicemeeter/models.py | 2 +- src/nvda_voicemeeter/util.py | 7 +++++-- src/nvda_voicemeeter/window.py | 10 +++++----- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/nvda_voicemeeter/cdll.py b/src/nvda_voicemeeter/cdll.py index cf273da..d0162db 100644 --- a/src/nvda_voicemeeter/cdll.py +++ b/src/nvda_voicemeeter/cdll.py @@ -33,7 +33,7 @@ def get_nvdapath(): try: NVDA_PATH = Path(get_nvdapath()) / "nvda.exe" -except FileNotFoundError as e: +except FileNotFoundError: NVDA_PATH = "" diff --git a/src/nvda_voicemeeter/models.py b/src/nvda_voicemeeter/models.py index 3f1b962..adc5198 100644 --- a/src/nvda_voicemeeter/models.py +++ b/src/nvda_voicemeeter/models.py @@ -5,7 +5,7 @@ def _make_hardware_ins_cache(vm) -> dict: def _make_hardware_outs_cache(vm) -> dict: hw_outs = {**{f"HARDWARE OUT||A{i + 1}": vm.bus[i].device.name for i in range(vm.kind.phys_out)}} if vm.kind.name == "basic": - hw_outs |= {f"HARDWARE OUT||A2": vm.bus[1].device.name} + hw_outs |= {"HARDWARE OUT||A2": vm.bus[1].device.name} return hw_outs diff --git a/src/nvda_voicemeeter/util.py b/src/nvda_voicemeeter/util.py index fc3d3d3..78f0fa6 100644 --- a/src/nvda_voicemeeter/util.py +++ b/src/nvda_voicemeeter/util.py @@ -48,8 +48,11 @@ def get_patch_composite_list(kind) -> list: for i in range(kind.phys_out): [temp.append(f"IN#{i + 1} {channel}") for channel in ("Left", "Right")] for i in range(kind.phys_out, kind.phys_out + kind.virt_out): - [temp.append(f"IN#{i + 1} {channel}") for channel in ("Left", "Right", "Center", "LFE", "SL", "SR", "BL", "BR")] - temp.append(f"BUS Channel") + [ + temp.append(f"IN#{i + 1} {channel}") + for channel in ("Left", "Right", "Center", "LFE", "SL", "SR", "BL", "BR") + ] + temp.append("BUS Channel") return temp diff --git a/src/nvda_voicemeeter/window.py b/src/nvda_voicemeeter/window.py index 23b320a..5fcfac1 100644 --- a/src/nvda_voicemeeter/window.py +++ b/src/nvda_voicemeeter/window.py @@ -45,7 +45,7 @@ class NVDAVMWindow(psg.Window): for i in range(self.kind.phys_out): self[f"HARDWARE OUT||A{i + 1}"].Widget.config(**buttonmenu_opts) if self.kind.name == "basic": - self[f"HARDWARE OUT||A2"].Widget.config(**buttonmenu_opts) + self["HARDWARE OUT||A2"].Widget.config(**buttonmenu_opts) if self.kind.name != "basic": [self[f"PATCH COMPOSITE||PC{i + 1}"].Widget.config(**buttonmenu_opts) for i in range(self.kind.phys_out)] slider_opts = {"takefocus": 1, "highlightthickness": 1} @@ -190,9 +190,9 @@ class NVDAVMWindow(psg.Window): self[f"HARDWARE OUT||A{i + 1}"].bind("", "||KEY SPACE", propagate=False) self[f"HARDWARE OUT||A{i + 1}"].bind("", "||KEY ENTER", propagate=False) if self.vm.kind.name == "basic": - self[f"HARDWARE OUT||A2"].bind("", "||FOCUS IN") - self[f"HARDWARE OUT||A2"].bind("", "||KEY SPACE", propagate=False) - self[f"HARDWARE OUT||A2"].bind("", "||KEY ENTER", propagate=False) + self["HARDWARE OUT||A2"].bind("", "||FOCUS IN") + self["HARDWARE OUT||A2"].bind("", "||KEY SPACE", propagate=False) + self["HARDWARE OUT||A2"].bind("", "||KEY ENTER", propagate=False) # Patch ASIO if self.kind.name != "basic": @@ -423,7 +423,7 @@ class NVDAVMWindow(psg.Window): identifier, partial = focus.Key.split("||") _, index = identifier.split() index = int(index) - data = self.popup.rename("Label", index, title=f"Rename", tab=tab) + data = self.popup.rename("Label", index, title="Rename", tab=tab) if not data: # cancel was pressed continue match tab: