From 9da21ce4501da24971803650c639296e681ad341 Mon Sep 17 00:00:00 2001
From: Kai Reinhard <K.Reinhard@micromata.de>
Date: Mon, 17 Dec 2018 21:16:40 +0000
Subject: [PATCH] Config file is now moved to ~/.borgbutler
---
borgbutler-core/src/main/java/de/micromata/borgbutler/config/ConfigurationHandler.java | 27 ++++++++++++---------------
borgbutler-core/src/test/java/de/micromata/borgbutler/config/ConfigHandlerTest.java | 4 ++--
2 files changed, 14 insertions(+), 17 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 0ca8f06..1fc9131 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
@@ -13,12 +13,13 @@
public class ConfigurationHandler {
private static Logger log = LoggerFactory.getLogger(ConfigurationHandler.class);
private static ConfigurationHandler instance = new ConfigurationHandler();
- private static final String APP_WORKING_DIR = ".borgbutler";
- private static final String CONFIG_FILENAME = ".borgbutler.json";
- private static final String CONFIG_BACKUP_FILENAME = ".borgbutler-bak.json";
+ private static final String BUTLER_HOME_DIR = ".borgbutler";
+ private static final String CONFIG_FILENAME = "borgrepos.json";
+ private static final String CONFIG_BACKUP_FILENAME = "borgrepos-bak.json";
@Getter
private File configFile;
- private File backupConfigFile;
+ private File configBackupFile;
+ @Getter
private File workingDir;
private Configuration configuration = new Configuration();
@@ -51,8 +52,8 @@
try {
if (configFile.exists()) {
// Create backup-file first:
- log.info("Creating backup file first: '" + backupConfigFile.getAbsolutePath() + "'");
- FileUtils.copyFile(configFile, backupConfigFile);
+ log.info("Creating backup file first: '" + configBackupFile.getAbsolutePath() + "'");
+ FileUtils.copyFile(configFile, configBackupFile);
}
log.info("Writing config file '" + configFile.getAbsolutePath() + "'");
FileUtils.write(configFile, json, Definitions.STD_CHARSET);
@@ -61,19 +62,15 @@
}
}
- public File getWorkingDir() {
+ private ConfigurationHandler() {
+ File userHome = new File(System.getProperty("user.home"));
+ workingDir = new File(userHome, BUTLER_HOME_DIR);
if (!workingDir.exists()) {
log.info("Creating borg-butlers working directory: " + workingDir.getAbsolutePath());
workingDir.mkdirs();
}
- return workingDir;
- }
-
- private ConfigurationHandler() {
- File userHome = new File(System.getProperty("user.home"));
- configFile = new File(userHome, CONFIG_FILENAME);
- backupConfigFile = new File(userHome, CONFIG_BACKUP_FILENAME);
- workingDir = new File(userHome, APP_WORKING_DIR);
+ configFile = new File(workingDir, CONFIG_FILENAME);
+ configBackupFile = new File(workingDir, CONFIG_BACKUP_FILENAME);
read();
}
}
diff --git a/borgbutler-core/src/test/java/de/micromata/borgbutler/config/ConfigHandlerTest.java b/borgbutler-core/src/test/java/de/micromata/borgbutler/config/ConfigHandlerTest.java
index b5be676..eb71dda 100644
--- a/borgbutler-core/src/test/java/de/micromata/borgbutler/config/ConfigHandlerTest.java
+++ b/borgbutler-core/src/test/java/de/micromata/borgbutler/config/ConfigHandlerTest.java
@@ -9,9 +9,9 @@
public class ConfigHandlerTest {
@Test
void readWriteTest() throws IOException {
- File origConfigFile = new File(System.getProperty("user.home"), ".borgbutler-orig.json");
+ File workingDir = ConfigurationHandler.getInstance().getWorkingDir();
+ File origConfigFile = new File(workingDir, ".borgbutler-orig.json");
FileUtils.copyFile(ConfigurationHandler.getInstance().getConfigFile(), origConfigFile);
- Configuration configuration = ConfigurationHandler.getConfiguration();
ConfigurationHandler.getInstance().write();
FileUtils.copyFile(origConfigFile, ConfigurationHandler.getInstance().getConfigFile());
}
--
Gitblit v1.10.0