fixes #78, but maybe we rethink this together: (#90)

* fixes #78, but our progress levels / stages are not super intuitive:
we already modify the library at the end of "waiting for user selection" -
at which point apply_choice is invoked (does not move files, but adds to library)

* test album count

* added fixme comment for a future refactor

Author: pSpitzner

backend/beets_flask/importer/progress.py

@@ -38,8 +38,8 @@ class Progress(Enum):
 
     # ImportSession
     OFFERING_MATCHES = 30
-    WAITING_FOR_USER_SELECTION = 31
-    MATCH_THRESHOLD = 32
+    MATCH_THRESHOLD = 31
+    WAITING_FOR_USER_SELECTION = 32
     EARLY_IMPORTING = 33
     IMPORTING = 34
     MANIPULATING_FILES = 35

backend/beets_flask/importer/session.py

@@ -844,7 +844,7 @@ def __init__(
     @property
     def stages(self):
         stages = super().stages
-        stages.insert(after="user_query", stage=match_threshold(self))
+        stages.insert(before="user_query", stage=match_threshold(self))
         return stages
 
     def match_threshold(self, task: importer.ImportTask):
@@ -856,6 +856,11 @@ def match_threshold(self, task: importer.ImportTask):
         or raise an exception.
 
         Currently raising, as we do not have a dedicated progress for "not imported".
+
+        FIXME: Instead of adding a whole new stage, with progress and a session function,
+        we could simply extend the choose_match function. It's defined for the normal
+        import session, and gets called early in user_query.
+        (see #78)
         """
         try:
             task_state = self.state.get_task_state_for_task(task)

backend/tests/integration/test_flows.py

@@ -612,6 +612,7 @@ async def test_import_auto_accept(self, db_session: Session, path: Path):
         assert len(self.statuses) == 4
         assert self.statuses[2].status == FolderStatus.IMPORTING
         assert self.statuses[3].status == FolderStatus.FAILED
+        assert len(self.beets_lib.albums()) == 0
 
         await run_import_auto(
             "obsolete_hash_import_auto",
@@ -623,6 +624,7 @@ async def test_import_auto_accept(self, db_session: Session, path: Path):
         assert len(self.statuses) == 6
         assert self.statuses[4].status == FolderStatus.IMPORTING
         assert self.statuses[5].status == FolderStatus.IMPORTED
+        assert len(self.beets_lib.albums()) == 1
 
 
 class TestChooseCandidatesSingleTask(