Improved types and None checks from library updates

Author: Avasam

src/AutoSplit.py

@@ -496,7 +496,7 @@ def start_auto_splitter(self):
                 or (not self.start_auto_splitter_button.isEnabled() and not self.is_auto_controlled):
             return
 
-        start_label: str = self.start_image_status_value_label.text()
+        start_label = self.start_image_status_value_label.text()
         if start_label.endswith(("ready", "paused")):
             self.start_image_status_value_label.setText("not ready")
 
@@ -519,7 +519,7 @@ def __auto_splitter(self):  # noqa: PLR0912,PLR0915
         self.run_start_time = time()
 
         if not (validate_before_parsing(self) and parse_and_validate_images(self)):
-            # `safe_to_reload_start_image: bool = False` becasue __load_start_image also does this check,
+            # `safe_to_reload_start_image: bool = False` because __load_start_image also does this check,
             # we don't want to double a Start/Reset Image error message
             self.gui_changes_on_reset(False)
             return

src/capture_method/BitBltCaptureMethod.py

@@ -1,6 +1,5 @@
 import ctypes
 import ctypes.wintypes
-from typing import cast
 
 import numpy as np
 import pywintypes
@@ -68,7 +67,7 @@ def get_frame(self) -> tuple[MatLike | None, bool]:
                 (selection["x"] + left_bounds, selection["y"] + top_bounds),
                 win32con.SRCCOPY,
             )
-            image = np.frombuffer(cast(bytes, bitmap.GetBitmapBits(True)), dtype=np.uint8)
+            image = np.frombuffer(bitmap.GetBitmapBits(True), dtype=np.uint8)
         except (win32ui.error, pywintypes.error):
             # Invalid handle or the window was closed while it was being manipulated
             return None, False

src/capture_method/DesktopDuplicationCaptureMethod.py

@@ -3,8 +3,8 @@
 
 import cv2
 import d3dshot
-import numpy as np
 import win32con
+from cv2.typing import MatLike
 from typing_extensions import override
 from win32 import win32gui
 
@@ -55,7 +55,7 @@ def get_frame(self):
         right = selection["width"] + left
         bottom = selection["height"] + top
         screenshot = cast(
-            np.ndarray[int, np.dtype[np.generic]] | None,
+            MatLike | None,
             self.desktop_duplication.screenshot((left, top, right, bottom)),
         )
         if screenshot is None:

src/capture_method/WindowsGraphicsCaptureMethod.py

@@ -98,11 +98,12 @@ def get_frame(self) -> tuple[MatLike | None, bool]:
         except OSError:
             return None, False
 
+        # We were too fast and the next frame wasn't ready yet
+        if not frame:
+            return self.last_captured_frame, True
+
         async def coroutine():
-            # We were too fast and the next frame wasn't ready yet
-            if not frame:
-                return None
-            return await (SoftwareBitmap.create_copy_from_surface_async(frame.surface) or asyncio.sleep(0, None))
+            return await SoftwareBitmap.create_copy_from_surface_async(frame.surface)
 
         try:
             software_bitmap = asyncio.run(coroutine())
@@ -114,6 +115,7 @@ async def coroutine():
 
         if not software_bitmap:
             # HACK: Can happen when starting the region selector
+            # TODO: Validate if this is still true
             return self.last_captured_frame, True
             # raise ValueError("Unable to convert Direct3D11CaptureFrame to SoftwareBitmap.")
         bitmap_buffer = software_bitmap.lock_buffer(BitmapBufferAccessMode.READ_WRITE)

src/capture_method/__init__.py

@@ -173,14 +173,13 @@ def get_input_device_resolution(index: int):
     return resolution
 
 
-async def get_all_video_capture_devices() -> list[CameraInfo]:
+async def get_all_video_capture_devices():
     named_video_inputs = FilterGraph().get_input_devices()
 
     async def get_camera_info(index: int, device_name: str):
         backend = ""
-        # Probing freezes some devices (like GV-USB2 and AverMedia) if already in use
-        # #169
-        # FIXME: Maybe offer the option to the user to obtain more info about their devies?
+        # Probing freezes some devices (like GV-USB2 and AverMedia) if already in use. See #169
+        # FIXME: Maybe offer the option to the user to obtain more info about their devices?
         #        Off by default. With a tooltip to explain the risk.
         # video_capture = cv2.VideoCapture(index)
         # video_capture.setExceptionMode(True)
@@ -203,7 +202,6 @@ async def get_camera_info(index: int, device_name: str):
     return [
         camera_info
         for camera_info
-        # Note: Return type required https://github.com/python/typeshed/issues/2652
         in await asyncio.gather(*starmap(get_camera_info, enumerate(named_video_inputs)))
         if camera_info is not None
     ]

src/user_profile.py

@@ -117,17 +117,15 @@ def __load_settings_from_file(autosplit: "AutoSplit", load_settings_file_path: s
         return False
     try:
         with open(load_settings_file_path, encoding="utf-8") as file:
-            # Casting here just so we can build an actual UserProfileDict once we're done validating
             # Fallback to default settings if some are missing from the file. This happens when new settings are added.
-            loaded_settings = cast(
-                UserProfileDict,
-                {
-                    **DEFAULT_PROFILE,
-                    **toml.load(file),
-                },
+            loaded_settings = UserProfileDict(
+
+                **DEFAULT_PROFILE,
+                **toml.load(file),
+
             )
         # TODO: Data Validation / fallbacks ?
-        autosplit.settings_dict = UserProfileDict(**loaded_settings)
+        autosplit.settings_dict = loaded_settings
         autosplit.last_loaded_settings = autosplit.settings_dict
 
         autosplit.x_spinbox.setValue(autosplit.settings_dict["capture_region"]["x"])
@@ -204,8 +202,7 @@ def load_check_for_updates_on_open(autosplit: "AutoSplit"):
     Retrieve the "Check For Updates On Open" QSettings and set the checkbox state
     These are only global settings values. They are not *toml settings values.
     """
-    # Type not infered by PySide6
-    # TODO: Report this issue upstream
+    # Type not infered by PySide6: https://bugreports.qt.io/browse/PYSIDE-2542
     value = cast(
         bool,
         QtCore

src/utils.py

@@ -22,7 +22,7 @@
     # Source does not exist, keep this under TYPE_CHECKING
     from _win32typing import PyCDC  # pyright: ignore[reportMissingModuleSource]
 
-_T = TypeVar("_T")
+T = TypeVar("T")
 
 
 DWMWA_EXTENDED_FRAME_BOUNDS = 9
@@ -74,9 +74,6 @@ def is_valid_hwnd(hwnd: int) -> bool:
     return True
 
 
-T = TypeVar("T")
-
-
 def first(iterable: Iterable[T]) -> T:
     """@return: The first element of a collection. Dictionaries will return the first key."""
     return next(iter(iterable))
@@ -125,7 +122,7 @@ def get_direct3d_device():
     media_capture = MediaCapture()
 
     async def init_mediacapture():
-        await (media_capture.initialize_async() or asyncio.sleep(0))
+        await media_capture.initialize_async()
 
     asyncio.run(init_mediacapture())
     direct_3d_device = media_capture.media_capture_settings and media_capture.media_capture_settings.direct3_d11_device
@@ -168,7 +165,7 @@ def wrapped(*args: Any, **kwargs: Any):
     return wrapped
 
 
-def flatten(nested_iterable: Iterable[Iterable[_T]]) -> chain[_T]:
+def flatten(nested_iterable: Iterable[Iterable[T]]) -> chain[T]:
     return chain.from_iterable(nested_iterable)