From 4f6306e702cf9fc77ea48a2d7307de39f5b11915 Mon Sep 17 00:00:00 2001
From: Kai Reinhard <K.Reinhard@micromata.de>
Date: Fri, 07 Dec 2018 23:40:02 +0000
Subject: [PATCH] ...
---
borgbutler-core/src/main/java/de/micromata/borgbutler/config/ConfigurationHandler.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/borgbutler-core/src/main/java/de/micromata/borgbutler/config/ConfigurationHandler.java b/borgbutler-core/src/main/java/de/micromata/borgbutler/config/ConfigurationHandler.java
index a141234..033e272 100644
--- a/borgbutler-core/src/main/java/de/micromata/borgbutler/config/ConfigurationHandler.java
+++ b/borgbutler-core/src/main/java/de/micromata/borgbutler/config/ConfigurationHandler.java
@@ -1,6 +1,8 @@
package de.micromata.borgbutler.config;
import de.micromata.borgbutler.json.JsonUtils;
+import lombok.AccessLevel;
+import lombok.Getter;
import org.apache.commons.io.FileUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -13,7 +15,11 @@
private static Logger log = LoggerFactory.getLogger(ConfigurationHandler.class);
private static ConfigurationHandler instance = new ConfigurationHandler();
private static final String CONFIG_FILENAME = ".borgbutler.json";
+ private static final String CONFIG_BACKUP_FILENAME = ".borgbutler-bak.json";
+ @Getter(AccessLevel.PACKAGE)
private File configFile;
+ @Getter(AccessLevel.PACKAGE)
+ private File backupConfigFile;
private Configuration configuration = new Configuration();
public static ConfigurationHandler getInstance() {
@@ -25,6 +31,7 @@
}
public void read() {
+ log.info("Reading config file '" + configFile.getAbsolutePath() + "'");
try {
String json = FileUtils.readFileToString(configFile, Charset.forName("UTF-8"));
this.configuration = JsonUtils.fromJson(Configuration.class, json);
@@ -35,8 +42,14 @@
}
public void write() {
- String json = JsonUtils.toJson(configuration);
+ String json = JsonUtils.toJson(configuration, true);
try {
+ if (configFile.exists()) {
+ // Create backup-file first:
+ log.info("Creating backup file first: '" + backupConfigFile.getAbsolutePath() + "'");
+ FileUtils.copyFile(configFile, backupConfigFile);
+ }
+ log.info("Writing config file '" + configFile.getAbsolutePath() + "'");
FileUtils.write(configFile, json, Charset.forName("UTF-8"));
} catch (IOException ex) {
log.error("Error while trying to write config file: " + configFile.getAbsolutePath() + ": " + ex.getMessage(), ex);
@@ -45,5 +58,6 @@
private ConfigurationHandler() {
configFile = new File(System.getProperty("user.home"), CONFIG_FILENAME);
+ backupConfigFile = new File(System.getProperty("user.home"), CONFIG_BACKUP_FILENAME);
}
}
--
Gitblit v1.10.0