deblan-mirror/abraunegg-onedrive
deblan-mirror/abraunegg-onedrive
1
0
Fork 0
mirror of https://github.com/abraunegg/onedrive synced 2024-04-26 11:30:40 +02:00
Code Issues Projects Releases Wiki Activity

Fix --display-config being impacted by --resync approval requirement (#1950)

Browse source 
* When using --display-config this option should not be impacted by any --resync flag or requirement to use --resync
This commit is contained in:
abraunegg 2022-05-06 04:48:50 +10:00 committed by GitHub
parent d4b733ae89
commit e08792da42
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/main.d
View file

@ -175,7 +175,7 @@ int main(string[] args)
}
// --resync should be a 'last resort item' .. the user needs to 'accept' to proceed
if (cfg.getValueBool("resync")) {
if ((cfg.getValueBool("resync")) && (!cfg.getValueBool("display_config"))) {
// what is the risk acceptance?
bool resyncRiskAcceptance = false;
@ -293,7 +293,10 @@ int main(string[] args)
// Was config file updated between last execution ang this execution?
if (currentConfigHash != previousConfigHash) {
// config file was updated, however we only want to trigger a --resync requirement if sync_dir, skip_dir, skip_file or drive_id was modified
log.log("config file has been updated, checking if --resync needed");
if (!cfg.getValueBool("display_config")){
// only print this message if we are not using --display-config
log.log("config file has been updated, checking if --resync needed");
}
if (exists(configBackupFile)) {
// check backup config what has changed for these configuration options if anything
// # sync_dir = "~/OneDrive"
@ -576,17 +579,6 @@ int main(string[] args)
}
}
// Handle --resync to remove local files
if (cfg.getValueBool("resync")) {
log.vdebug("--resync requested");
log.log("Deleting the saved application sync status ...");
if (!cfg.getValueBool("dry_run")) {
safeRemove(cfg.databaseFilePath);
safeRemove(cfg.deltaLinkFilePath);
safeRemove(cfg.uploadStateFilePath);
}
}
// Display current application configuration, no application initialisation
if (cfg.getValueBool("display_config")){
// Display application version
@ -652,6 +644,17 @@ int main(string[] args)
return EXIT_SUCCESS;
}
// Handle --resync to remove local files
if (cfg.getValueBool("resync")) {
log.vdebug("--resync requested");
log.log("Deleting the saved application sync status ...");
if (!cfg.getValueBool("dry_run")) {
safeRemove(cfg.databaseFilePath);
safeRemove(cfg.deltaLinkFilePath);
safeRemove(cfg.uploadStateFilePath);
}
}
// Test if OneDrive service can be reached, exit if it cant be reached
log.vdebug("Testing network to ensure network connectivity to Microsoft OneDrive Service");
online = testNetwork();