Skip to content

Delete directory if move to trash failed #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Rylern merged 1 commit into from
Jul 16, 2025
Merged

Delete directory if move to trash failed #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion extensionmanager-app/src/main/java/qupath/ext/extensionmanager/app/ExtensionManagerApp.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public void start(Stage stage) throws IOException {
extensionCatalogManager = new ExtensionCatalogManager(
new SimpleObjectProperty<>(createExtensionDirectory()),
ExtensionManagerApp.class.getClassLoader(),
"v0.6.0-rc3",
"v0.6.0",
new Registry(List.of(new SavedCatalog(
"QuPath catalog",
"Extensions maintained by the QuPath team",
Expand Down
7 changes: 5 additions & 2 deletions extensionmanager/src/main/java/qupath/ext/extensionmanager/core/tools/FileTools.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,11 @@ public static void moveDirectoryToTrashOrDeleteRecursively(File directoryToDelet

Desktop desktop = Desktop.isDesktopSupported() ? Desktop.getDesktop() : null;
if (desktop != null && desktop.isSupported(Desktop.Action.MOVE_TO_TRASH)) {
logger.debug("Moving {} to trash", directoryToDelete);
desktop.moveToTrash(directoryToDelete);
logger.debug("Attempting to move {} to trash", directoryToDelete);
if (!desktop.moveToTrash(directoryToDelete)) {
logger.debug("Failed to move {} to trash. Deleting it", directoryToDelete);
deleteDirectoryRecursively(directoryToDelete);
}
} else {
logger.debug("Moving to trash not supported. Deleting {}", directoryToDelete);
deleteDirectoryRecursively(directoryToDelete);
Expand Down
Loading