typing: update type hints

Author: senyai

gmc/file_widgets/multiple_sources_one_destination.py

@@ -1,28 +1,27 @@
 from __future__ import annotations
-from typing import Callable
-from PyQt5 import QtCore, QtWidgets
-from ..utils import separator, get_icon
+from PyQt5 import QtCore, QtWidgets, QtGui
+from ..utils import separator, get_icon, tr
 from ..views.filesystem_widget import (
     MultipleFilesystemWidget,
     SingleFilesystemWidget,
     FilesystemTitle,
 )
 from itertools import zip_longest
 from ..application import GMCArguments
+from ..mdi_area import MdiArea
 
 Qt = QtCore.Qt
-tr: Callable[[str], str] = lambda text: QtCore.QCoreApplication.translate(
-    "@default", text
-)
 
 
 class MultipleSourcesOneDestination:
     NSOURCES = 2
     SOURCE_TITLES = ["First Image", "Second Image"]
 
     @classmethod
-    def create_data_widget(cls, mdi_area, settings, extra_args: GMCArguments):
-        def _on_open_src(view_idx, new_tab):
+    def create_data_widget(
+        cls, mdi_area: MdiArea, settings, extra_args: GMCArguments
+    ):
+        def _on_open_src(view_idx: int, new_tab: bool) -> None:
             view = cls._source_widget.views()[view_idx]
             dst_dir = cls._destination_widget.get_root_qdir()
             if dst_dir is None:
@@ -50,15 +49,15 @@ def _on_open_src(view_idx, new_tab):
                 )
                 new_tab = True
 
-        def _on_open_dst(self, new=False):
-            def selected_files(root_path):
+        def _on_open_dst(self, new: bool = False) -> None:
+            def selected_files(root_path: QtCore.QFileInfo):
                 for path in self._destination_view.selected_files_relative:
                     path = path[: -len(".json")]
                     yield root_path.filePath(path)
 
             self._on_open(selected_files, new)
 
-        def _on_view_dst_file():
+        def _on_view_dst_file() -> None:
             for path in cls._destination_widget.view().selected_files():
                 f = QtCore.QFile(path)
                 if not f.open(f.ReadOnly | f.Text):
@@ -139,7 +138,7 @@ def _on_view_dst_file():
         return splitter
 
     @classmethod
-    def save_settings(cls, settings):
+    def save_settings(cls, settings) -> None:
         settings.setValue(
             cls.__name__ + "_src_dir", cls._source_widget.get_root_string()
         )
@@ -172,7 +171,9 @@ def __init__(self, schema):
         self._all_files = [None] * schema.NSOURCES
         self._idx = [None] * schema.NSOURCES
 
-    def _create_go_actions(self, n, actions_name, actions, icon, where):
+    def _create_go_actions(
+        self, n: int, actions_name: str, actions, icon: QtGui.QIcon, where: int
+    ):
         for idx, (caption, shortcuts) in zip_longest(
             range(n), actions, fillvalue=(actions_name, None)
         ):
@@ -186,7 +187,7 @@ def _create_go_actions(self, n, actions_name, actions, icon, where):
             shortcuts and action.setShortcuts(shortcuts)
             yield action
 
-    def _get_default_actions(self, n):
+    def _get_default_actions(self, n: int):
         """:returns: actions, every markup window should have."""
         prev_shortcuts = (
             (
@@ -240,7 +241,14 @@ def _get_default_actions(self, n):
         ):
             yield prev_action, next_action, separator(self), save_action
 
-    def open_current(self, view_idx, dst_dir, src_dir, file_path, all_files):
+    def open_current(
+        self,
+        view_idx: int,
+        dst_dir: QtCore.QDir,
+        src_dir: QtCore.QDir,
+        file_path: str,
+        all_files,
+    ) -> None:
         """The function is "public" only because it fixes focus issue."""
         self._dst_dir = dst_dir
         self._all_files[view_idx] = all_files

gmc/file_widgets/one_source_one_destination.py

@@ -1,16 +1,13 @@
 from __future__ import annotations
-from typing import Callable, Sequence
+from typing import Sequence
 from PyQt5 import QtCore, QtWidgets, QtGui
-from ..utils import separator, new_action
+from ..utils import separator, new_action, tr
 from ..views.filesystem_widget import SingleFilesystemWidget, FilesystemTitle
 from ..settings import settings
 from ..application import GMCArguments
 
 Qt = QtCore.Qt
 MB = QtWidgets.QMessageBox
-tr: Callable[[str], str] = lambda text: QtCore.QCoreApplication.translate(
-    "@default", text
-)
 
 
 class OneSourceOneDestination:
@@ -73,7 +70,7 @@ def selected_files():
 
             _on_open(selected_files(), new)
 
-        def _on_view_dst_file():
+        def _on_view_dst_file() -> None:
             for path in cls._destination_widget.view().selected_files():
                 f = QtCore.QFile(path)
                 if not f.open(f.ReadOnly | f.Text):
@@ -177,7 +174,7 @@ def __init__(
         file_path: str,
         all_files: list[str],
         schema,
-    ):
+    ) -> None:
         """
         :param dst_dir: `QDir` root destination path
         :param src_dir: `QDir` root source path

gmc/views/filesystem_view.py

@@ -1,4 +1,5 @@
-from typing import Any, Iterable
+from __future__ import annotations
+from typing import Any, Iterable, TYPE_CHECKING
 from PyQt5 import QtCore, QtGui, QtWidgets
 from ..utils import separator, new_action, tr
 
@@ -172,7 +173,7 @@ def _selected_info_map(self) -> Iterable[QtCore.QFileInfo]:
 
     @property
     def selected_files_relative(self) -> list[str]:
-        root_dir: QtCore.QDir = self.model().root_dir_qdir
+        root_dir = self.model().root_dir_qdir
         return [
             root_dir.relativeFilePath(info.filePath())
             for info in self._selected_info_map
@@ -213,12 +214,12 @@ def contextMenuEvent(self, event: QtGui.QContextMenuEvent) -> None:
         menu.exec_(event.globalPos())
 
     def set_path(self, path: str) -> None:
-        model: MinimalFileSystemModel = self.model()
+        model = self.model()
         index = model.setRootPath(path)
         self.setRootIndex(index)
 
     def set_name_filters(self, name_filters: Iterable[str]):
-        model: MinimalFileSystemModel = self.model()
+        model = self.model()
         model.setNameFilters(name_filters)
 
     def user_select_path(
@@ -234,6 +235,10 @@ def user_select_path(
         if path:
             callback(self, path)
 
+    if TYPE_CHECKING:
+
+        def model(self) -> MinimalFileSystemModel: ...
+
 
 class MinimalFileSystemModel(QtWidgets.QFileSystemModel):
     _sel_path: QtCore.QDir | None = None

gmc/views/filesystem_widget.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 from typing import NamedTuple, Sequence
 from PyQt5 import QtCore, QtWidgets
 from .filesystem_view import FilesystemView
@@ -23,7 +24,7 @@ def __init__(
         parent: QtWidgets.QWidget,
         title: FilesystemTitle,
         actions: list[QtWidgets.QAction],
-    ):
+    ) -> None:
         assert isinstance(title, FilesystemTitle), title
         super().__init__(
             parent,
@@ -45,7 +46,7 @@ def __init__(
 
         view.model().rootPathChanged.connect(self._root_changed)
 
-    def _root_changed(self):
+    def _root_changed(self) -> None:
         self._view.model().rootPathChanged.disconnect(self._root_changed)
         self._layout.takeAt(1).widget().setParent(None)
         self._layout.addWidget(self._view)