Fixes for warning on OSX because of double entries in menu bar

Fixes for search index where unchecked exception interrupted the index build up Run search index only after 14 days instat of always on startup causing 25% CPU usage
lanthale · May 12, 2024 · 2f9225a · 2f9225a
1 parent 839af88
commit 2f9225a
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/PhotoSlide/src/main/java/org/photoslide/search/SearchIndex.java b/PhotoSlide/src/main/java/org/photoslide/search/SearchIndex.java
@@ -81,6 +81,9 @@ protected Void call() throws Exception {
                     Files.walkFileTree(pathItem.getFilePath(), new SimpleFileVisitor<Path>() {
                         @Override
                         public FileVisitResult visitFile(final Path fileItem, final BasicFileAttributes attrs) throws IOException {
+                            if (task.isCancelled()) {
+                                return FileVisitResult.TERMINATE;
+                            }
                             int pathlength = fileItem.toString().length();
                             if (pathlength > 35) {
                                 updateMessage("..." + fileItem.toString().substring(pathlength - 35, pathlength));
@@ -130,7 +133,7 @@ public FileVisitResult visitFile(final Path fileItem, final BasicFileAttributes
                                             insertMediaFileIntoSearchDB(collectionName, m);
                                         }
                                     } catch (Throwable ex) {
-                                        Logger.getLogger(SearchIndex.class.getName()).log(Level.FINEST, "Cannot read " + m.getName() + " - " + m.getPathStorage(), ex);                                        
+                                        Logger.getLogger(SearchIndex.class.getName()).log(Level.FINEST, "Cannot read " + m.getName() + " - " + m.getPathStorage(), ex);
                                     }
                                 }
                             }
@@ -140,8 +143,11 @@ public FileVisitResult visitFile(final Path fileItem, final BasicFileAttributes
                         @Override
                         public FileVisitResult postVisitDirectory(Path dir, IOException e)
                                 throws IOException {
+                            if (task.isCancelled()) {
+                                return FileVisitResult.TERMINATE;
+                            }
                             boolean finishedSearch = Files.isSameFile(dir, pathItem.getFilePath());
-                            if (finishedSearch) {                                
+                            if (finishedSearch) {
                                 App.setSEARCHINDEXFINISHED(LocalDate.now());
                                 checkSearchIndex(pathItem.getFilePath().toString());
                                 return FileVisitResult.TERMINATE;