Prevent sequential jobs from being executed when user cancels the lis…

…t repair dialog
Borewit · Sep 17, 2023 · 5457ceb · 5457ceb
1 parent 0ca0795
commit 5457ceb
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 10 deletions.
diff --git a/src/main/java/listfix/view/GUIScreen.java b/src/main/java/listfix/view/GUIScreen.java
@@ -1700,12 +1700,12 @@ private void updateTabTitleForPlaylist(Playlist list, JDocumentComponent<Playlis
 
   public void runClosestMatchOnAllTabs()
   {
-    this._playlistTabbedPane.getAllEmbeddedMainComponent().forEach(ctrl -> {
+    for (PlaylistEditCtrl ctrl : this._playlistTabbedPane.getAllEmbeddedMainComponent()) {
       this._playlistTabbedPane.setActiveDocument(ctrl.getPlaylist().getPath());
-      ctrl.locateMissingFiles();
-      ctrl.bulkFindClosestMatches();
-    });
-
+      if (!ctrl.locateMissingFiles() || !ctrl.bulkFindClosestMatches()) {
+        break;
+      }
+    }
   }
 
   private void reloadAllTabs()

diff --git a/src/main/java/listfix/view/controls/PlaylistEditCtrl.java b/src/main/java/listfix/view/controls/PlaylistEditCtrl.java
@@ -221,7 +221,11 @@ private void moveSelectedRowsDown()
     }
   }
 
-  public void locateMissingFiles()
+  /**
+   * Locate missing files
+   * @return false if cancelled, otherwise true
+   */
+  public boolean locateMissingFiles()
   {
     _logger.debug(markerRepair, "Start locateMissingFiles()");
     ProgressWorker<List<Integer>, String> worker = new ProgressWorker<>()
@@ -261,8 +265,10 @@ protected void done()
         }
       }
     };
+
     ProgressDialog pd = new ProgressDialog(getParentFrame(), true, worker, "Repairing...");
-    pd.setVisible(true);
+    pd.setVisible(true); // Wait until the worker completed
+    return !worker.isCancelled();
   }
 
   private void reorderList()
@@ -386,7 +392,10 @@ protected List<BatchMatchItem> doInBackground()
     this.findClosestMatches(worker);
   }
 
-  public void bulkFindClosestMatches()
+  /**
+   * @return false if cancelled otherwise true
+   */
+  public boolean bulkFindClosestMatches()
   {
     final Collection<String> libraryFiles = listFixGui.getApplicationConfiguration().getMediaLibrary().getNestedMediaFiles();
     ProgressWorker<List<BatchMatchItem>, String> worker = new ProgressWorker<>()
@@ -398,6 +407,7 @@ protected List<BatchMatchItem> doInBackground()
       }
     };
     this.findClosestMatches(worker);
+    return !worker.isCancelled();
   }
 
   private void findClosestMatches(ProgressWorker<List<BatchMatchItem>, String> worker)
@@ -730,8 +740,9 @@ public void mouseClicked(MouseEvent evt)
     _btnMagicFix.setToolTipText("Repair playlist");
     _btnMagicFix.setEnabled(_playlist != null && _playlist.getFile().exists());
     _btnMagicFix.addActionListener(evt -> {
-      locateMissingFiles();
-      bulkFindClosestMatches();
+      if (locateMissingFiles()) {
+        bulkFindClosestMatches();
+      }
     });
     _uiToolbar.add(_btnMagicFix);