Merge branch 'use-pywin32-stubs-fork' of https://github.com/Avasam/Auto-Split into More-capture-options

Author: Avasam

.flake8

@@ -3,26 +3,17 @@ color=always
 max-line-length=120
 ; Auto generated
 exclude=src/gen/
-; Linebreak before binary operator
-; Allow default value other than "..."
-; Allow imports at the bottom of file
-ignore=W503,Y015,E402
+ignore=
+  W503, ; Linebreak before binary operator
+  Y015, ; Allow default value other than "..."
+  E402, ; Allow imports at the bottom of file
+  Y026, ; Not using typing_extensions
 per-file-ignores=
-    ; Function bodys contain other than just ... (eg: raise)
-    ; Default values for typed arguments
-    typings/win32typing/__init__.pyi: Q000,E704,E501,N8,  Y021,Y020,  Y010,Y011
-    typings/win32-stubs/win32gui.pyi: Q000,E704,E501,N8,  Y021,Y020,  Y010,Y011
-
-    ; Docstrings in type stubs
-    ; Quoted annotations
-    ; TypeAlias
-    typings/win32*/*:                 Q000,E704,E501,N8,  Y021,Y020,Y026
-
     ; Docstrings in type stubs
     ; Function bodys contain other than just ... (eg: raise)
-    ; TypeAlias
+
     ; Single quote docstrings
-    typings/cv2-stubs/__init__.pyi:   Q000,E704,E501,N8,  Y021,Y010,Y026, Q002
+    typings/cv2-stubs/__init__.pyi:   Q000,E704,E501,N8,  Y021,Y010,  Q002
 
     ; Quotes
     ; Allow ... on same line as def

.vscode/settings.json

@@ -66,6 +66,8 @@
   "python.linting.flake8CategorySeverity.F": "Warning",
   // PEP8 Naming convention
   "python.linting.flake8CategorySeverity.N": "Warning",
+  // PYI
+  "python.linting.flake8CategorySeverity.Y": "Warning",
   // PyRight obsoletes mypy
   "python.linting.mypyEnabled": false,
   // Is already wrapped by Flake8, prospector and pylama

pyproject.toml

@@ -16,17 +16,21 @@ aggressive = 3
 pythonPlatform = "Windows"
 typeCheckingMode = "strict"
 # Extra strict
-reportPropertyTypeMismatch=true
-reportUninitializedInstanceVariable=true
-reportCallInDefaultInitializer=true
-reportImplicitStringConcatenation=true
-ignore = [
+reportImplicitStringConcatenation="error"
+reportCallInDefaultInitializer="error"
+reportMissingSuperCall="none" # False positives on base classes
+reportPropertyTypeMismatch="error"
+reportUninitializedInstanceVariable="error"
+reportUnnecessaryTypeIgnoreComment="error"
+reportUnusedCallResult="none"
+exclude = [
   # Auto generated
   "src/gen/",
   # We expect stub files to be incomplete or contain useless statements
   "typings/",
 ]
-reportMissingTypeStubs = "information"
+# Type stubs may not be completable
+reportMissingTypeStubs = "warning"
 # False positives with TYPE_CHECKING
 reportImportCycles = "information"
 # False positives with PyQt .connect. pylint(no-member) works instead

scripts/requirements.txt

@@ -30,8 +30,8 @@ bandit
 flake8
 flake8-pyi
 flake8-quotes
-pylint
-pywin32-stubs
+pylint>=2.13
+git+https://github.com/Avasam/pywin32-stubs.git#egg=pywin32-stubs # https://github.com/kaluluosi/pywin32-stubs/pull/4
 simplejson
 types-simplejson>=3.17.2
 types-requests

src/AutoSplit.py

@@ -753,8 +753,7 @@ def __get_capture_for_comparison(self):
         if capture is None:
             # Try to recover by using the window name
             self.live_image.setText("Trying to recover window...")
-            # https://github.com/kaluluosi/pywin32-stubs/issues/7
-            hwnd = win32gui.FindWindow(None, self.settings_dict["captured_window_title"])  # type: ignore
+            hwnd = win32gui.FindWindow(None, self.settings_dict["captured_window_title"])
             # Don't fallback to desktop
             if hwnd:
                 self.hwnd = hwnd

src/capture_windows.py

@@ -41,8 +41,7 @@ def __bit_blt_capture(hwnd: int, selection: Region, render_full_content: bool =
     # If the window closes while it's being manipulated, it could cause a crash
     try:
         window_dc: int = win32gui.GetWindowDC(hwnd)
-        # https://github.com/kaluluosi/pywin32-stubs/issues/6
-        dc_object: PyCDC = win32ui.CreateDCFromHandle(window_dc)  # type: ignore
+        dc_object: PyCDC = win32ui.CreateDCFromHandle(window_dc)
 
         # Causes a 10-15x performance drop. But allows recording hardware accelerated windows
         if render_full_content:

src/menu_bar.py

@@ -210,7 +210,7 @@ def get_default_settings_from_ui(autosplit: AutoSplit):
         "pause_hotkey": default_settings_dialog.pause_input.text(),
         "fps_limit": default_settings_dialog.fps_limit_spinbox.value(),
         "live_capture_region": default_settings_dialog.live_capture_region_checkbox.isChecked(),
-        "capture_method": get_capture_method_by_index(default_settings_dialog.capture_method_combobox.currentIndex()),
+        "capture_method": get_capture_method_by_index(0),
         "default_comparison_method": default_settings_dialog.default_comparison_method.currentIndex(),
         "default_similarity_threshold": default_settings_dialog.default_similarity_threshold_spinbox.value(),
         "default_delay_time": default_settings_dialog.default_delay_time_spinbox.value(),

src/user_profile.py

@@ -143,8 +143,7 @@ def __load_settings_from_file(autosplit: AutoSplit, load_settings_file_path: str
             set_hotkey(autosplit, "pause", autosplit.settings_dict["pause_hotkey"])
 
     if autosplit.settings_dict["captured_window_title"]:
-        # https://github.com/kaluluosi/pywin32-stubs/issues/7
-        hwnd = win32gui.FindWindow(None, autosplit.settings_dict["captured_window_title"])  # type: ignore
+        hwnd = win32gui.FindWindow(None, autosplit.settings_dict["captured_window_title"])
         if hwnd:
             autosplit.hwnd = hwnd
         else:

typings/d3dshot/capture_outputs/__init__.pyi

@@ -36,9 +36,6 @@ class Display:
             dxgi_adapter=...) -> None:
         ...
 
-    def __repr__(self) -> str:
-        ...
-
     def capture(self, process_func, region=...) -> None:
         ...