Re-use AutoSplit reference from __init__

Author: Avasam

src/AutoControlledThread.py

@@ -1,46 +1,46 @@
-from typing import TYPE_CHECKING
-
-from PySide6 import QtCore
-
-import error_messages
-import user_profile
-
-if TYPE_CHECKING:
-    from AutoSplit import AutoSplit
-
-
-class AutoControlledThread(QtCore.QThread):
-    def __init__(self, autosplit: "AutoSplit"):
-        self.autosplit = autosplit
-        super().__init__()
-
-    @QtCore.Slot()
-    def run(self):
-        while True:
-            try:
-                line = input()
-            except RuntimeError:
-                self.autosplit.show_error_signal.emit(error_messages.stdin_lost)
-                break
-            except EOFError:
-                continue
-            match line:
-                # This is for use in a Development environment
-                case "kill":
-                    self.autosplit.closeEvent()
-                    break
-                case "start":
-                    self.autosplit.start_auto_splitter()
-                case "split" | "skip":
-                    self.autosplit.skip_split_signal.emit()
-                case "undo":
-                    self.autosplit.undo_split_signal.emit()
-                case "reset":
-                    self.autosplit.reset_signal.emit()
-                # TODO: Not yet implemented in AutoSplit Integration
-                # case 'pause':
-                #     self.pause_signal.emit()
-                case line:
-                    if line.startswith("settings"):
-                        # Allow for any split character between "settings" and the path
-                        user_profile.load_settings(self.autosplit, line[9:])
+from typing import TYPE_CHECKING
+
+from PySide6 import QtCore
+
+import error_messages
+import user_profile
+
+if TYPE_CHECKING:
+    from AutoSplit import AutoSplit
+
+
+class AutoControlledThread(QtCore.QThread):
+    def __init__(self, autosplit: "AutoSplit"):
+        self._autosplit_ref = autosplit
+        super().__init__()
+
+    @QtCore.Slot()
+    def run(self):
+        while True:
+            try:
+                line = input()
+            except RuntimeError:
+                self._autosplit_ref.show_error_signal.emit(error_messages.stdin_lost)
+                break
+            except EOFError:
+                continue
+            match line:
+                # This is for use in a Development environment
+                case "kill":
+                    self._autosplit_ref.closeEvent()
+                    break
+                case "start":
+                    self._autosplit_ref.start_auto_splitter()
+                case "split" | "skip":
+                    self._autosplit_ref.skip_split_signal.emit()
+                case "undo":
+                    self._autosplit_ref.undo_split_signal.emit()
+                case "reset":
+                    self._autosplit_ref.reset_signal.emit()
+                # TODO: Not yet implemented in AutoSplit Integration
+                # case 'pause':
+                #     self.pause_signal.emit()
+                case line:
+                    if line.startswith("settings"):
+                        # Allow for any split character between "settings" and the path
+                        user_profile.load_settings(self._autosplit_ref, line[9:])

src/AutoSplit.py

@@ -95,7 +95,7 @@ def __init__(self):  # noqa: PLR0915
         self.split_image_number = 0
         self.split_images_and_loop_number: list[tuple[AutoSplitImage, int]] = []
         self.split_groups: list[list[int]] = []
-        self.capture_method = CaptureMethodBase(None)
+        self.capture_method = CaptureMethodBase(self)
         self.is_running = False
 
         # Last loaded settings empty and last successful loaded settings file path to None until we try to load them
@@ -249,7 +249,7 @@ def __update_live_image_details(self, capture: MatLike | None, called_from_timer
         if called_from_timer:
             if self.is_running or self.start_image:
                 return
-            capture, _ = self.capture_method.get_frame(self)
+            capture, _ = self.capture_method.get_frame()
 
         # Update title from target window or Capture Device name
         capture_region_window_label = (
@@ -387,7 +387,7 @@ def __take_screenshot(self):
             screenshot_index += 1
 
         # Grab screenshot of capture region
-        capture, _ = self.capture_method.get_frame(self)
+        capture, _ = self.capture_method.get_frame()
         if not is_valid_image(capture):
             error_messages.region()
             return
@@ -782,7 +782,7 @@ def gui_changes_on_reset(self, safe_to_reload_start_image: bool = False):
 
     def __get_capture_for_comparison(self):
         """Grab capture region and resize for comparison."""
-        capture, is_old_image = self.capture_method.get_frame(self)
+        capture, is_old_image = self.capture_method.get_frame()
 
         # This most likely means we lost capture
         # (ie the captured window was closed, crashed, lost capture device, etc.)
@@ -792,9 +792,9 @@ def __get_capture_for_comparison(self):
                 self.live_image.setText("Waiting for capture device...")
             else:
                 self.live_image.setText("Trying to recover window...")
-                recovered = self.capture_method.recover_window(self.settings_dict["captured_window_title"], self)
+                recovered = self.capture_method.recover_window(self.settings_dict["captured_window_title"])
                 if recovered:
-                    capture, _ = self.capture_method.get_frame(self)
+                    capture, _ = self.capture_method.get_frame()
 
         self.__update_live_image_details(capture)
         return capture, is_old_image
@@ -868,7 +868,7 @@ def exit_program() -> NoReturn:
             if self.update_auto_control:
                 # self.update_auto_control.terminate() hangs in PySide6
                 self.update_auto_control.quit()
-            self.capture_method.close(self)
+            self.capture_method.close()
             if event is not None:
                 event.accept()
             if self.is_auto_controlled:

src/capture_method/BitBltCaptureMethod.py

@@ -1,6 +1,6 @@
 import ctypes
 import ctypes.wintypes
-from typing import TYPE_CHECKING, cast
+from typing import cast
 
 import numpy as np
 import pywintypes
@@ -13,9 +13,6 @@
 from capture_method.CaptureMethodBase import CaptureMethodBase
 from utils import BGRA_CHANNEL_COUNT, get_window_bounds, is_valid_hwnd, try_delete_dc
 
-if TYPE_CHECKING:
-    from AutoSplit import AutoSplit
-
 # This is an undocumented nFlag value for PrintWindow
 PW_RENDERFULLCONTENT = 0x00000002
 
@@ -32,12 +29,12 @@ class BitBltCaptureMethod(CaptureMethodBase):
     _render_full_content = False
 
     @override
-    def get_frame(self, autosplit: "AutoSplit") -> tuple[MatLike | None, bool]:
-        selection = autosplit.settings_dict["capture_region"]
-        hwnd = autosplit.hwnd
+    def get_frame(self) -> tuple[MatLike | None, bool]:
+        selection = self._autosplit_ref.settings_dict["capture_region"]
+        hwnd = self._autosplit_ref.hwnd
         image: MatLike | None = None
 
-        if not self.check_selected_region_exists(autosplit):
+        if not self.check_selected_region_exists():
             return None, False
 
         # If the window closes while it's being manipulated, it could cause a crash
@@ -77,9 +74,9 @@ def get_frame(self, autosplit: "AutoSplit") -> tuple[MatLike | None, bool]:
         return image, False
 
     @override
-    def recover_window(self, captured_window_title: str, autosplit: "AutoSplit"):
+    def recover_window(self, captured_window_title: str):
         hwnd = win32gui.FindWindow(None, captured_window_title)
         if not is_valid_hwnd(hwnd):
             return False
-        autosplit.hwnd = hwnd
-        return self.check_selected_region_exists(autosplit)
+        self._autosplit_ref.hwnd = hwnd
+        return self.check_selected_region_exists()

src/capture_method/CaptureMethodBase.py

@@ -1,41 +1,43 @@
-from typing import TYPE_CHECKING
-
-from cv2.typing import MatLike
-
-from utils import is_valid_hwnd
-
-if TYPE_CHECKING:
-    from AutoSplit import AutoSplit
-
-
-class CaptureMethodBase:
-    name = "None"
-    short_description = ""
-    description = ""
-
-    def __init__(self, autosplit: "AutoSplit | None"):
-        # Some capture methods don't need an initialization process
-        pass
-
-    def reinitialize(self, autosplit: "AutoSplit"):
-        self.close(autosplit)
-        self.__init__(autosplit)  # type: ignore[misc]
-
-    def close(self, autosplit: "AutoSplit"):
-        # Some capture methods don't need an initialization process
-        pass
-
-    def get_frame(self, autosplit: "AutoSplit") -> tuple[MatLike | None, bool]:  # noqa: PLR6301
-        """
-        Captures an image of the region for a window matching the given
-        parameters of the bounding box.
-
-        @return: The image of the region in the window in BGRA format
-        """
-        return None, False
-
-    def recover_window(self, captured_window_title: str, autosplit: "AutoSplit") -> bool:  # noqa: PLR6301
-        return False
-
-    def check_selected_region_exists(self, autosplit: "AutoSplit") -> bool:  # noqa: PLR6301
-        return is_valid_hwnd(autosplit.hwnd)
+from typing import TYPE_CHECKING
+
+from cv2.typing import MatLike
+
+from utils import is_valid_hwnd
+
+if TYPE_CHECKING:
+    from AutoSplit import AutoSplit
+
+
+class CaptureMethodBase:
+    name = "None"
+    short_description = ""
+    description = ""
+
+    _autosplit_ref: "AutoSplit"
+
+    def __init__(self, autosplit: "AutoSplit"):
+        # Some capture methods don't need an initialization process
+        self._autosplit_ref = autosplit
+
+    def reinitialize(self):
+        self.close()
+        self.__init__(self._autosplit_ref)  # type: ignore[misc]
+
+    def close(self):
+        # Some capture methods don't need an initialization process
+        pass
+
+    def get_frame(self) -> tuple[MatLike | None, bool]:  # noqa: PLR6301
+        """
+        Captures an image of the region for a window matching the given
+        parameters of the bounding box.
+
+        @return: The image of the region in the window in BGRA format
+        """
+        return None, False
+
+    def recover_window(self, captured_window_title: str) -> bool:  # noqa: PLR6301
+        return False
+
+    def check_selected_region_exists(self) -> bool:
+        return is_valid_hwnd(self._autosplit_ref.hwnd)