Fix #47, updated some configs and types from typeshed (#173)

* Updated configs

* Updated typings

* Updated some code

* Fix #47

* Revert mypy stuff

Author: Avasam

pyproject.toml

@@ -21,7 +21,6 @@ reportMissingSuperCall="none" # False positives on base classes
 reportPropertyTypeMismatch="error"
 reportUninitializedInstanceVariable="error"
 reportUnnecessaryTypeIgnoreComment="error"
-reportUnusedCallResult="none"
 # Exclude from scanning when running pyright
 exclude = [
   # Auto generated, produces unecessary `# type: ignore`
@@ -32,6 +31,7 @@ ignore = [
   # We expect stub files to be incomplete or contain useless statements
   "**/*.pyi",
 ]
+reportUnusedCallResult="none"
 # Type stubs may not be completable
 reportMissingTypeStubs = "warning"
 # False positives with TYPE_CHECKING

scripts/build.ps1

@@ -1,7 +1,6 @@
 & "$PSScriptRoot/compile_resources.ps1"
 pyinstaller `
   --onefile `
-  --windowed `
   --additional-hooks-dir=Pyinstaller/hooks `
   --icon=res/icon.ico `
   --splash=res/splash.png `

scripts/lint.ps1

@@ -4,7 +4,7 @@ $exitCodes = 0
 
 Write-Host "`nRunning autofixes..."
 isort src/ typings/
-autopep8 src/ typings/ --in-place
+autopep8 $(git ls-files '**.py*') --in-place
 
 Write-Host "`nRunning Pyright..."
 $Env:PYRIGHT_PYTHON_FORCE_VERSION = 'latest'

scripts/requirements-dev.txt

@@ -27,4 +27,6 @@ pyright
 qt6-applications
 # Types
 pywin32-stubs>=1.0.7 # Added error types
+types-keyboard
+types-pyautogui
 typing-extensions

src/AutoSplit.py

@@ -206,7 +206,7 @@ def __init__(self, parent: QWidget | None = None):  # pylint: disable=too-many-s
         self.show()
 
         try:
-            import pyi_splash  # type: ignore # pylint: disable=import-outside-toplevel
+            import pyi_splash  # pyright: ignore[reportMissingModuleSource] # pylint: disable=import-outside-toplevel
             pyi_splash.close()
         except ModuleNotFoundError:
             pass

src/region_selection.py

@@ -149,6 +149,7 @@ def __get_window_from_point(x: int, y: int):
     # Want to pull the parent window from the window handle
     # By using GetAncestor we are able to get the parent window instead
     # of the owner window.
+    # TODO: Fix stubs, IsChild should return a boolean
     while win32gui.IsChild(win32gui.GetParent(hwnd), hwnd):
         hwnd = cast(int, user32.GetAncestor(hwnd, GA_ROOT))
 

src/user_profile.py

@@ -137,7 +137,8 @@ def __load_settings_from_file(autosplit: AutoSplit, load_settings_file_path: str
                 set_hotkey(autosplit, hotkey, cast(str, autosplit.settings_dict[hotkey_name]))
 
     change_capture_method(cast(CaptureMethodEnum, autosplit.settings_dict["capture_method"]), autosplit)
-    autosplit.capture_method.recover_window(autosplit.settings_dict["captured_window_title"], autosplit)
+    if autosplit.settings_dict["capture_method"] != CaptureMethodEnum.VIDEO_CAPTURE_DEVICE:
+        autosplit.capture_method.recover_window(autosplit.settings_dict["captured_window_title"], autosplit)
     if not autosplit.capture_method.check_selected_region_exists(autosplit):
         autosplit.live_image.setText("Reload settings after opening"
                                      + f'\n"{autosplit.settings_dict["captured_window_title"]}"'

src/utils.py

@@ -46,6 +46,7 @@ def is_valid_hwnd(hwnd: int):
     if not hwnd:
         return False
     if sys.platform == "win32":
+        # TODO: Fix stubs, IsWindow should return a boolean
         return bool(win32gui.IsWindow(hwnd) and win32gui.GetWindowText(hwnd))
     return True
 
@@ -104,6 +105,6 @@ def wrapped(*args: Any, **kwargs: Any):
 # Shared strings
 # Set AUTOSPLIT_BUILD_NUMBER to an empty string to generate a clean version number
 # AUTOSPLIT_BUILD_NUMBER = ""  # pyright: ignore[reportConstantRedefinition]  # noqa: F811
-AUTOSPLIT_VERSION = "2.0.0-alpha.5" + (f"-{AUTOSPLIT_BUILD_NUMBER}" if AUTOSPLIT_BUILD_NUMBER else "")
+AUTOSPLIT_VERSION = "2.0.0-alpha.6" + (f"-{AUTOSPLIT_BUILD_NUMBER}" if AUTOSPLIT_BUILD_NUMBER else "")
 START_AUTO_SPLITTER_TEXT = "Start Auto Splitter"
 GITHUB_REPOSITORY = AUTOSPLIT_GITHUB_REPOSITORY

typings/PyInstaller/__init__.pyi

@@ -0,0 +1,11 @@
+from typing_extensions import LiteralString
+
+from PyInstaller import compat as compat
+
+__all__ = ("HOMEPATH", "PLATFORM", "__version__", "DEFAULT_DISTPATH", "DEFAULT_SPECPATH", "DEFAULT_WORKPATH")
+__version__: str = ...
+HOMEPATH: str = ...
+DEFAULT_SPECPATH: str = ...
+DEFAULT_DISTPATH: str = ...
+DEFAULT_WORKPATH: str = ...
+PLATFORM: LiteralString = ...

typings/PyInstaller/__main__.pyi

@@ -0,0 +1,13 @@
+# https://pyinstaller.org/en/stable/usage.html#running-pyinstaller-from-python-code
+from collections.abc import Iterable
+
+from _typeshed import SupportsKeysAndGetItem
+from typing_extensions import TypeAlias
+
+# Used to update PyInstaller.config.CONF
+_PyIConfig: TypeAlias = (
+    SupportsKeysAndGetItem[str, bool | str | list[str] | None] | Iterable[tuple[str, bool | str | list[str] | None]]
+)
+
+
+def run(pyi_args: Iterable[str] | None = ..., pyi_config: _PyIConfig | None = ...) -> None: ...