Initial mypy fixes

Author: rlaphoenix

nton/gui/widgets.py

@@ -1,14 +1,14 @@
 from PySide6.QtCore import Signal
-from PySide6.QtGui import QDragEnterEvent, QDragLeaveEvent
+from PySide6.QtGui import QDragEnterEvent, QDragLeaveEvent, QMouseEvent
 from PySide6.QtWidgets import QLabel, QStackedWidget
 
 
 class FileDropWidget(QStackedWidget):
-    def __init__(self, *args, **kwargs):
+    def __init__(self, *args, **kwargs) -> None:
         super().__init__(*args, **kwargs)
         self.setAcceptDrops(True)
 
-    def dragEnterEvent(self, event: QDragEnterEvent):
+    def dragEnterEvent(self, event: QDragEnterEvent) -> None:
         if event.mimeData().hasUrls():
             event.accept()
             self.window().openLabel.setStyleSheet(
@@ -31,5 +31,5 @@ def dragLeaveEvent(self, event: QDragLeaveEvent) -> None:
 class ClickableLabel(QLabel):
     clicked = Signal()  # This signal will be emitted when the label is clicked
 
-    def mousePressEvent(self, event):
+    def mousePressEvent(self, event: QMouseEvent) -> None:
         self.clicked.emit()  # Emit the signal when the label is clicked

nton/nstool.py

@@ -16,6 +16,9 @@ def verify(path: Path, type_: str) -> str | int | None:
     Verify if the Nintendo Switch file is valid.
     Returns an empty string if valid, an error str or return code otherwise.
     """
+    if not BIN or not Path(BIN).is_file():
+        raise EnvironmentError("nstool binary was not found. Please ensure nstool is installed and in your PATH.")
+
     if not path:
         raise ValueError("The path must not be empty.")
     if not isinstance(path, Path):
@@ -57,6 +60,9 @@ def get_nacp(asset_path: Path, output_path: Path) -> str | int | None:
 
     Returns an empty string if valid, an error str or return code otherwise.
     """
+    if not BIN or not Path(BIN).is_file():
+        raise EnvironmentError("nstool binary was not found. Please ensure nstool is installed and in your PATH.")
+
     try:
         subprocess.check_output(
             [
@@ -86,6 +92,9 @@ def get_icon(asset_path: Path, output_path: Path) -> str | int | None:
 
     Returns an empty string if valid, an error str or return code otherwise.
     """
+    if not BIN or not Path(BIN).is_file():
+        raise EnvironmentError("nstool binary was not found. Please ensure nstool is installed and in your PATH.")
+
     try:
         subprocess.check_output(
             [

pyinstaller.py

@@ -28,7 +28,6 @@
     ["nton/bin", "nton/bin"],
     ["nton/gui/main.ui", "nton/gui"]
 ]
-HIDDEN_IMPORTS = []
 EXTRA_ARGS = [
     "-y"
 ]
@@ -83,7 +82,6 @@
         ["-D", "-F"][args.one_file],
         ["-w", "-c"][args.console],
         *itertools.chain(*[["--add-data", ":".join(x)] for x in ADDITIONAL_DATA]),
-        *itertools.chain(*[["--hidden-import", x] for x in HIDDEN_IMPORTS]),
         "--version-file", str(version_file),
         *EXTRA_ARGS
     ])

pyproject.toml

@@ -81,3 +81,7 @@ disallow_untyped_defs = true
 follow_imports = "silent"
 ignore_missing_imports = true
 no_implicit_optional = true
+
+[[tool.mypy.overrides]]
+module = "nton.gui.resources"
+ignore_errors = true