deblan-mirror/abraunegg-onedrive
deblan-mirror/abraunegg-onedrive
1
0
Fork 0
mirror of https://github.com/abraunegg/onedrive synced 2024-05-21 07:06:40 +02:00
Code Issues Projects Releases Wiki Activity

config directory management fixes

Browse source
This commit is contained in:
Norbert Preining 2019-03-17 12:41:26 +09:00
parent 362bf35688
commit ab918dd82d
2 changed files with 22 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/config.d
View file

@ -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.

24
src/main.d
View file

@ -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.");