refactor ui

beets/importer/session.py

@@ -15,7 +15,7 @@
 
 import os
 import time
-from typing import TYPE_CHECKING, Sequence
+from typing import TYPE_CHECKING
 
 from beets import config, dbcore, library, logging, plugins, util
 from beets.importer.tasks import Action
@@ -25,6 +25,10 @@
 from .state import ImportState
 
 if TYPE_CHECKING:
+    from typing import Literal, Sequence
+
+    from beets.autotag import AlbumMatch, TrackMatch
+    from beets.importer.tasks import SingletonImportTask
     from beets.util import PathBytes
 
     from .tasks import ImportTask
@@ -60,7 +64,7 @@ def __init__(
         lib: library.Library,
         loghandler: logging.Handler | None,
         paths: Sequence[PathBytes] | None,
-        query: dbcore.Query | None,
+        query: dbcore.Query | str | list[str] | tuple[str] | None,
     ):
         """Create a session.
 
@@ -173,16 +177,20 @@ def log_choice(self, task: ImportTask, duplicate=False):
             elif task.choice_flag is Action.SKIP:
                 self.tag_log("skip", paths)
 
-    def should_resume(self, path: PathBytes):
+    def should_resume(self, path: PathBytes) -> bool:
         raise NotImplementedError
 
-    def choose_match(self, task: ImportTask):
+    def choose_match(
+        self, task: ImportTask
+    ) -> Literal[Action.ASIS, Action.SKIP] | AlbumMatch | TrackMatch:
         raise NotImplementedError
 
-    def resolve_duplicate(self, task: ImportTask, found_duplicates):
+    def resolve_duplicate(self, task: ImportTask, found_duplicates) -> None:
         raise NotImplementedError
 
-    def choose_item(self, task: ImportTask):
+    def choose_item(
+        self, task: SingletonImportTask
+    ) -> Literal[Action.ASIS, Action.SKIP] | AlbumMatch | TrackMatch:
         raise NotImplementedError
 
     def run(self):

beets/test/_common.py

@@ -107,7 +107,11 @@ def item(lib=None, **kwargs):
 
 # Dummy import session.
 def import_session(lib=None, loghandler=None, paths=[], query=[], cli=False):
-    cls = commands.TerminalImportSession if cli else importer.ImportSession
+    cls = (
+        commands.import_.session.TerminalImportSession
+        if cli
+        else importer.ImportSession
+    )
     return cls(lib, loghandler, paths, query)
 
 

beets/test/helper.py

@@ -54,7 +54,7 @@
 from beets.importer import ImportSession
 from beets.library import Item, Library
 from beets.test import _common
-from beets.ui.commands import TerminalImportSession
+from beets.ui.commands.import_.session import TerminalImportSession
 from beets.util import (
     MoveOperation,
     bytestring_path,