fix: clearer error reporting

report processing is done don't report all works are up to date
dvirtz · Jan 17, 2025 · 3bd3d1b · 3bd3d1b
1 parent 81b7f8e
commit 3bd3d1b
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 23 deletions.
diff --git a/src/acum-work-import/import-album.ts b/src/acum-work-import/import-album.ts
@@ -59,29 +59,38 @@ async function importSelectedWorks(
   const artistCache: ArtistCache = new Map();
 
   return await lastValueFrom(
-    from(selectedRecordings).pipe(
-      map(([position, workBean, recordingState]) => [workBean, recordingState, addTrackWarning(position)] as const),
-      tap(([workBean, recordingState, addWarning]) => {
-        const recording = recordingState.recording;
-        if (trackName(workBean) != recording.name) {
-          if (compareInsensitive(trackName(workBean), recording.name) === 0) {
-            workBean.workEngName = workBean.workHebName = recording.name;
-          } else {
-            addWarning(`Work name of ${recording.name} is different from recording name, please verify`);
+    iif(
+      () => selectedRecordings.length > 0,
+      from(selectedRecordings).pipe(
+        map(([position, workBean, recordingState]) => [workBean, recordingState, addTrackWarning(position)] as const),
+        tap(([workBean, recordingState, addWarning]) => {
+          const recording = recordingState.recording;
+          if (trackName(workBean) != recording.name) {
+            if (compareInsensitive(trackName(workBean), recording.name) === 0) {
+              workBean.workEngName = workBean.workHebName = recording.name;
+            } else {
+              addWarning(`Work name of ${recording.name} is different from recording name, please verify`);
+            }
           }
-        }
-      }),
-      mergeMap(
-        async ([workBean, recordingState, addWarning]) =>
-          [workBean, recordingState.recording, await addWork(workBean, recordingState, addWarning), addWarning] as const
-      ),
-      mergeMap(args => linkCreators(artistCache, ...args)),
-      connect(shared =>
-        merge(
-          shared.pipe(maybeSetEditNote(entity, addWarning)),
-          shared.pipe(updateProgress(selectedRecordings, setProgress), ignoreElements())
+        }),
+        mergeMap(
+          async ([workBean, recordingState, addWarning]) =>
+            [
+              workBean,
+              recordingState.recording,
+              await addWork(workBean, recordingState, addWarning),
+              addWarning,
+            ] as const
+        ),
+        mergeMap(args => linkCreators(artistCache, ...args)),
+        connect(shared =>
+          merge(
+            shared.pipe(maybeSetEditNote(entity, addWarning)),
+            shared.pipe(updateProgress(selectedRecordings, setProgress), ignoreElements())
+          )
         )
-      )
+      ),
+      from(selectedRecordings).pipe(updateProgress(selectedRecordings, setProgress), ignoreElements(), endWith(false))
     )
   );
 }

diff --git a/src/acum-work-import/ui/release-editor-ui.tsx b/src/acum-work-import/ui/release-editor-ui.tsx
@@ -26,8 +26,7 @@ function AcumImporter() {
   async function importWorks(entity: Entity) {
     clearWarnings();
     try {
-      await tryImportWorks(entity, addWarning, setProgress);
-      setWorksPending(true);
+      setWorksPending(await tryImportWorks(entity, addWarning, setProgress));
     } catch (err) {
       console.error(err);
       addWarning(`Import failed: ${String(err)}`);