From 9926a79503c9bd6454c076f2b60cd577f6061e4d Mon Sep 17 00:00:00 2001
From: Kai Reinhard <K.Reinhard@micromata.de>
Date: Sat, 19 Feb 2022 07:29:58 +0000
Subject: [PATCH] Using Borg version 1.1.17 as default. Version is now configurable via web client and json file.
---
borgbutler-server/src/main/java/de/micromata/borgbutler/server/BorgConfig.java | 50 ++++++++++++++++++++++++--------------------------
1 files changed, 24 insertions(+), 26 deletions(-)
diff --git a/borgbutler-server/src/main/java/de/micromata/borgbutler/server/BorgVersion.java b/borgbutler-server/src/main/java/de/micromata/borgbutler/server/BorgConfig.java
similarity index 76%
rename from borgbutler-server/src/main/java/de/micromata/borgbutler/server/BorgVersion.java
rename to borgbutler-server/src/main/java/de/micromata/borgbutler/server/BorgConfig.java
index 0f4c91f..194da8a 100644
--- a/borgbutler-server/src/main/java/de/micromata/borgbutler/server/BorgVersion.java
+++ b/borgbutler-server/src/main/java/de/micromata/borgbutler/server/BorgConfig.java
@@ -2,12 +2,8 @@
import org.apache.commons.lang3.StringUtils;
-public class BorgVersion {
- public static final String BORG_DEFAULT_DOWNLOAD_VERSION = "1.1.16";
-
- private static final String BORG_VERSION = BORG_DEFAULT_DOWNLOAD_VERSION;
-
- private String binariesDownloadVersion = BORG_DEFAULT_DOWNLOAD_VERSION;
+public class BorgConfig {
+ public static final String BORG_DEFAULT_DOWNLOAD_VERSION = "1.1.17";
private String[][] borgBinaries = {
{"freebsd64", "FreeBSD 64"},
@@ -18,7 +14,7 @@
private String minimumRequiredBorgVersion = "1.1.8";
public String getBinariesDownloadUrl() {
- return "https://github.com/borgbackup/borg/releases/download/" + binariesDownloadVersion + "/";
+ return "https://github.com/borgbackup/borg/releases/download/" + version + "/";
}
/**
@@ -28,10 +24,10 @@
private String borgBinary;
private boolean versionOK = false;
- private String version;
+ private String version = BORG_DEFAULT_DOWNLOAD_VERSION;
private String statusMessage;
- public BorgVersion copyFrom(BorgVersion other) {
+ public BorgConfig copyFrom(BorgConfig other) {
this.borgBinary = other.borgBinary;
this.versionOK = other.versionOK;
this.version = other.version;
@@ -39,18 +35,6 @@
return this;
}
- public String getBinariesDownloadVersion() {
- return this.binariesDownloadVersion;
- }
-
- public void setBinariesDownloadVersion(String binariesDownloadVersion) {
- if (StringUtils.isNotBlank(binariesDownloadVersion)) {
- this.binariesDownloadVersion = binariesDownloadVersion;
- } else {
- this.binariesDownloadVersion = BORG_DEFAULT_DOWNLOAD_VERSION;
- }
- }
-
public String[][] getBorgBinaries() {
return this.borgBinaries;
}
@@ -78,22 +62,26 @@
return this.statusMessage;
}
- BorgVersion setBorgBinary(String borgBinary) {
+ BorgConfig setBorgBinary(String borgBinary) {
this.borgBinary = borgBinary;
return this;
}
- BorgVersion setVersionOK(boolean versionOK) {
+ BorgConfig setVersionOK(boolean versionOK) {
this.versionOK = versionOK;
return this;
}
- BorgVersion setVersion(String version) {
- this.version = version;
+ BorgConfig setVersion(String version) {
+ if (StringUtils.isNotBlank(version)) {
+ this.version = version;
+ } else {
+ this.version = BORG_DEFAULT_DOWNLOAD_VERSION;
+ }
return this;
}
- BorgVersion setStatusMessage(String statusMessage) {
+ BorgConfig setStatusMessage(String statusMessage) {
this.statusMessage = statusMessage;
return this;
}
@@ -125,4 +113,14 @@
}
return version.split("\\.");
}
+
+ @Override
+ public String toString() {
+ return "BorgConfig{" +
+ ", borgBinary='" + borgBinary + '\'' +
+ ", versionOK=" + versionOK +
+ ", version='" + version + '\'' +
+ ", statusMessage='" + statusMessage + '\'' +
+ '}';
+ }
}
--
Gitblit v1.10.0