From dbc0a8433134a341f6a359234e62b744f1a9555c Mon Sep 17 00:00:00 2001
From: Kai Reinhard <K.Reinhard@micromata.de>
Date: Sat, 17 Apr 2021 12:09:49 +0000
Subject: [PATCH] WIP
---
borgbutler-core/src/main/kotlin/de/micromata/borgbutler/config/ConfigurationHandler.kt | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/borgbutler-core/src/main/kotlin/de/micromata/borgbutler/config/ConfigurationHandler.kt b/borgbutler-core/src/main/kotlin/de/micromata/borgbutler/config/ConfigurationHandler.kt
index d4f9444..2fdc9f1 100644
--- a/borgbutler-core/src/main/kotlin/de/micromata/borgbutler/config/ConfigurationHandler.kt
+++ b/borgbutler-core/src/main/kotlin/de/micromata/borgbutler/config/ConfigurationHandler.kt
@@ -1,7 +1,5 @@
package de.micromata.borgbutler.config
-import de.micromata.borgbutler.config.Definitions
-import de.micromata.borgbutler.json.JsonUtils
import mu.KotlinLogging
import org.apache.commons.io.FileUtils
import java.io.File
@@ -23,14 +21,8 @@
private var configuration: Configuration? = null
private fun read() {
- if (configFile.canRead()) {
- log.info("Reading config file '" + configFile.absolutePath + "'")
- val jsonConfigFile = File(workingDir, CONFIG_FILENAME)
- if (jsonConfigFile.canRead()) {
- val yaml = FileUtils.readFileToString(jsonConfigFile, Definitions.STD_CHARSET)
- configuration = YamlUtils.fromYaml(configClazz, yaml)
- }
- } else {
+ configuration = readJsonConfigfile(workingDir)
+ if (configuration == null) {
Legacy.readOldJsonConfigFile(workingDir, OLD_JSON_CONFIG_FILENAME)?.let {
configuration = it
save()
@@ -120,6 +112,16 @@
fun getConfigClazz(): Class<out Configuration> {
return configClazz
}
+
+ fun readJsonConfigfile(workingDir: File): Configuration? {
+ val configFile = File(workingDir, CONFIG_FILENAME)
+ if (!configFile.canRead()) {
+ return null
+ }
+ log.info("Reading config file '" + configFile.absolutePath + "'")
+ val yaml = FileUtils.readFileToString(configFile, Definitions.STD_CHARSET)
+ return YamlUtils.fromYaml(configClazz, yaml)
+ }
}
init {
--
Gitblit v1.10.0