From ab918dd82dde99e3b05e25706750cb5a491ffd7d Mon Sep 17 00:00:00 2001
From: Norbert Preining <norbert@preining.info>
Date: Sun, 17 Mar 2019 12:41:26 +0900
Subject: [PATCH] config directory management fixes

---
 src/config.d | 11 +++++++----
 src/main.d   | 24 +++++++++++++++---------
 2 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/src/config.d b/src/config.d
index 9bef00b8..e82c0537 100644
--- a/src/config.d
+++ b/src/config.d
@@ -13,6 +13,7 @@ final class Config
 	public string uploadStateFilePath;
 	public string syncListFilePath;
 	public string homePath;
+	public string configDirName;
 
 	private string userConfigFilePath;
 	// hashmap for the values found in the user config file
@@ -23,7 +24,7 @@ final class Config
 	private long[string] longValues;
 
 
-	this(string configDirName)
+	this(string confdirOption)
 	{
 		// default configuration
 		stringValues["single_directory"] = "";
@@ -79,13 +80,15 @@ final class Config
 	
 		// Determine the correct configuration directory to use
 		string configDirBase;
-		if (configDirName != "") {
+		if (confdirOption != "") {
 			// A CLI 'confdir' was passed in
-			log.vdebug("configDirName: CLI override to set configDirName to: ", configDirName);
+			log.vdebug("configDirName: CLI override to set configDirName to: ", confdirOption);
 			if (canFind(configDirName,"~")) {
 				// A ~ was found
 				log.vdebug("configDirName: A '~' was found in configDirName, using the calculated 'homePath' to replace '~'");
-				configDirName = homePath ~ strip(configDirName,"~","~");
+				configDirName = homePath ~ strip(confdirOption,"~","~");
+			} else {
+				configDirName = confdirOption;
 			}
 		} else {
 			// Determine the base directory relative to which user specific configuration files should be stored.
diff --git a/src/main.d b/src/main.d
index dfe72087..70cc37a1 100644
--- a/src/main.d
+++ b/src/main.d
@@ -20,7 +20,7 @@ int main(string[] args)
 	stdout.setvbuf(0, _IONBF);
 	
 	// configuration directory
-	string configDirName;
+	string confdirOption;
 
 	try {
 		// print the version and exit
@@ -30,7 +30,7 @@ int main(string[] args)
 			std.getopt.config.passThrough,
 			std.getopt.config.bundling,
 			std.getopt.config.caseSensitive,
-			"confdir", "Set the directory used to store the configuration files", &configDirName,
+			"confdir", "Set the directory used to store the configuration files", &confdirOption,
 			"version", "Print the version and exit", &printVersion
 		);
 		if (opt.helpWanted) {
@@ -51,8 +51,9 @@ int main(string[] args)
 		return EXIT_FAILURE;
 	}
 
+
 	// load configuration file if available
-	auto cfg = new config.Config(configDirName);
+	auto cfg = new config.Config(confdirOption);
 	if (!cfg.initialize()) {
 		// There was an error loading the configuration
 		// Error message already printed
@@ -61,6 +62,11 @@ int main(string[] args)
 	// update configuration from command line args
 	cfg.update_from_args(args);
 
+	// dry-run notification
+	if (cfg.getValueBool("dry_run")) {
+		log.log("DRY-RUN Configured. Output below shows what 'would' have occurred.");
+	}
+
 	
 	// Are we able to reach the OneDrive Service
 	bool online = false;
@@ -116,9 +122,9 @@ int main(string[] args)
 	log.setNotifications(cfg.getValueBool("monitor") && !cfg.getValueBool("disable_notifications"));
 	
 	// upgrades
-	if (exists(configDirName ~ "/items.db")) {
+	if (exists(cfg.configDirName ~ "/items.db")) {
 		if (!cfg.getValueBool("dry_run")) {
-			safeRemove(configDirName ~ "/items.db");
+			safeRemove(cfg.configDirName ~ "/items.db");
 		}
 		log.logAndNotify("Database schema changed, resync needed");
 		cfg.setValueBool("resync", true);
@@ -140,12 +146,12 @@ int main(string[] args)
 
 	// Display current application configuration, no application initialisation
 	if (cfg.getValueBool("display_config")){
-		string userConfigFilePath = configDirName ~ "/config";
-		string userSyncList = configDirName ~ "/sync_list";
+		string userConfigFilePath = cfg.configDirName ~ "/config";
+		string userSyncList = cfg.configDirName ~ "/sync_list";
 		// Display application version
 		std.stdio.write("onedrive version                    = ", import("version"));
 		// Display all of the pertinent configuration options
-		writeln("Config path                         = ", configDirName);
+		writeln("Config path                         = ", cfg.configDirName);
 		
 		// Does a config file exist or are we using application defaults
 		if (exists(userConfigFilePath)){
@@ -294,7 +300,7 @@ int main(string[] args)
 	if (cfg.getValueBool("disable_upload_validation")) sync.setDisableUploadValidation();
 	
 	// Do we need to validate the syncDir to check for the presence of a '.nosync' file
-	if (cfg.getValueBool("check_for_nomount")) {
+	if (cfg.getValueBool("check_nomount")) {
 		// we were asked to check the mounts
 		if (exists(syncDir ~ "/.nosync")) {
 			log.logAndNotify("ERROR: .nosync file found. Aborting synchronization process to safeguard data.");