From 7f78d2ed3b282c6bd6bba9dde4110cd4f3d558cf Mon Sep 17 00:00:00 2001
From: Kai Reinhard <K.Reinhard@micromata.de>
Date: Sun, 18 Apr 2021 23:24:27 +0000
Subject: [PATCH] restore doesn't open download dialog anymore.
---
borgbutler-server/src/main/kotlin/de/micromata/borgbutler/server/rest/ArchivesRest.kt | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/borgbutler-server/src/main/kotlin/de/micromata/borgbutler/server/rest/ArchivesRest.kt b/borgbutler-server/src/main/kotlin/de/micromata/borgbutler/server/rest/ArchivesRest.kt
index 8f73dcc..4423148 100644
--- a/borgbutler-server/src/main/kotlin/de/micromata/borgbutler/server/rest/ArchivesRest.kt
+++ b/borgbutler-server/src/main/kotlin/de/micromata/borgbutler/server/rest/ArchivesRest.kt
@@ -9,6 +9,7 @@
import de.micromata.borgbutler.data.FileSystemFilter
import de.micromata.borgbutler.json.JsonUtils
import de.micromata.borgbutler.json.borg.BorgFilesystemItem
+import de.micromata.borgbutler.server.RunningMode
import de.micromata.borgbutler.utils.DirUtils
import mu.KotlinLogging
import org.apache.commons.collections4.CollectionUtils
@@ -149,7 +150,7 @@
return RestUtils.notFound()
}
if (openDownloads == true) openFileBrowser(File(restoreDir, item.getPath()))
- return ResponseEntity.ok("OK")
+ return ResponseEntity.accepted().body("OK")
} catch (ex: IOException) {
log.error("No file extracted: " + ex.message, ex)
return RestUtils.notFound()
@@ -157,7 +158,7 @@
}
private fun openFileBrowser(fileDirectory: File) {
- if (Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Desktop.Action.BROWSE_FILE_DIR)) {
+ if (RunningMode.desktopSupportsBrowse) {
var file: File? = fileDirectory
if (!fileDirectory.exists() || Files.isSymbolicLink(fileDirectory.toPath())) {
// Open parent.
--
Gitblit v1.10.0