From 79f739f250fbde54e130392d1ac074f7b15214d0 Mon Sep 17 00:00:00 2001 From: onyx-and-iris Date: Tue, 30 Jan 2024 14:34:11 +0000 Subject: [PATCH] upd controller_path to reflect changes to pyinstaller patch bump --- pdm.lock | 2 +- pyproject.toml | 8 ++++---- src/nvda_voicemeeter/cdll.py | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pdm.lock b/pdm.lock index 5339b26..9b2b09b 100644 --- a/pdm.lock +++ b/pdm.lock @@ -5,7 +5,7 @@ groups = ["default", "build", "lint", "test"] strategy = ["cross_platform"] lock_version = "4.4.1" -content_hash = "sha256:3fa263ac843989c1735416c5f86309c704b19653a99cfceb396e28e76dbc425f" +content_hash = "sha256:6be74981983ee2ba3a99c9aa75b10f6c7433fec0854390f82029635cb34d3e0b" [[package]] name = "altgraph" diff --git a/pyproject.toml b/pyproject.toml index f3d75d6..65ec175 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "nvda_voicemeeter" -version = "0.6.2" +version = "0.6.3" description = "A Voicemeeter app compatible with NVDA" authors = [ { name = "onyx-and-iris", email = "code@onyxandiris.online" }, @@ -17,9 +17,6 @@ readme = "README.md" text = "MIT" [tool.pdm.dev-dependencies] -build = [ - "pyinstaller>=5.1", -] lint = [ "black>=23.7.0", "ruff>=0.0.291", @@ -28,6 +25,9 @@ lint = [ test = [ "psgdemos>=1.12.1", ] +build = [ + "pyinstaller>=6.3.0", +] [tool.pdm.scripts.build] shell = "build.ps1" diff --git a/src/nvda_voicemeeter/cdll.py b/src/nvda_voicemeeter/cdll.py index dc85abb..e606466 100644 --- a/src/nvda_voicemeeter/cdll.py +++ b/src/nvda_voicemeeter/cdll.py @@ -5,7 +5,7 @@ from pathlib import Path from .errors import NVDAVMError -bits = 64 if ct.sizeof(ct.c_void_p) == 8 else 32 +BITS = 64 if ct.sizeof(ct.c_void_p) == 8 else 32 if platform.system() != "Windows": raise NVDAVMError("Only Windows OS supported") @@ -15,7 +15,7 @@ REG_KEY = "\\".join( None, ( "SOFTWARE", - "WOW6432Node" if bits == 64 else "", + "WOW6432Node" if BITS == 64 else "", "Microsoft", "Windows", "CurrentVersion", @@ -39,8 +39,8 @@ except FileNotFoundError: controller_path = Path(__file__).parents[2].resolve() / "controllerClient" if not controller_path.exists(): - controller_path = Path("controllerClient") + controller_path = Path("_internal") / "controllerClient" -DLL_PATH = controller_path / f"x{64 if bits == 64 else 86}" / f"nvdaControllerClient{bits}.dll" +DLL_PATH = controller_path / f"x{64 if BITS == 64 else 86}" / f"nvdaControllerClient{BITS}.dll" libc = ct.CDLL(str(DLL_PATH))