deblan-mirror/abraunegg-onedrive
deblan-mirror/abraunegg-onedrive
1
0
Fork 0
mirror of https://github.com/abraunegg/onedrive synced 2026-03-14 14:35:46 +01:00
Code Issues Projects Releases Wiki Activity

Update 'Client Side Filtering' documentation and handling (#3296)

Browse source 
* Fix documentation around missing 'check_nosync' needing a --resync when enabling / disabling
* Fix documentation around missing 'skip_size' needing a --resync when enabling / disabling
* Validate 'check_nosync' and 'skip_size' when used as part of a config file to trigger --resync
* Validate 'check_nosync' and 'skip_size' when used as part of CLI to trigger --resync
This commit is contained in:
abraunegg 2025-05-26 15:25:04 +10:00 • committed by GitHub
commit b496c4e21f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 28 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docs/usage.md
View file

@ -743,11 +743,13 @@ The following are supported for pattern matching and exclusion rules:
### Performing a --resync
If you alter any of the subsequent configuration items, you will be required to execute a `--resync` to make sure your client is syncing your data with the updated configuration:
* check_nosync
* drive_id
* sync_dir
* skip_file
* skip_dir
* skip_dotfiles
* skip_size
* skip_symlinks
* sync_business_shared_items
* Creating, Modifying or Deleting the 'sync_list' file

27
src/config.d
View file

@ -187,8 +187,10 @@ class ApplicationConfig {
private bool configFileSkipFileReadIn = false; // If we actually read in something from 'config' file, this gets set to true
private string configFileSkipDir = ""; // Default here is no directories are skipped
private string configFileDriveId = ""; // Default here is that no drive id is specified
private bool configFileCheckNoSync = false;
private bool configFileSkipDotfiles = false;
private bool configFileSkipSymbolicLinks = false;
private bool configFileSkipSize = false;
private bool configFileSyncBusinessSharedItems = false;
// File permission values (set via initialise function)
@ -835,6 +837,7 @@ class ApplicationConfig {
if (rawValue == "true") {
setValueBool(key, true);
// Additional config-specific flags for specific keys
if (key == "check_nosync") configFileCheckNoSync = true;
if (key == "skip_dotfiles") configFileSkipDotfiles = true;
if (key == "skip_symlinks") configFileSkipSymbolicLinks = true;
if (key == "sync_business_shared_items") configFileSyncBusinessSharedItems = true;
@ -1006,6 +1009,16 @@ class ApplicationConfig {
tempValue = defaultInotifyDelay;
}
setValueLong("inotify_delay", tempValue);
} else if (key == "skip_size") {
// Flag this for triggering --resync requirement
configFileSkipSize = true;
ulong tempValue = thisConfigValue;
// If set, this must be greater than 0
if (tempValue <= 0) {
addLogEntry("Invalid value for key in config file - using default value: " ~ key);
tempValue = 0;
}
setValueLong("skip_size", tempValue);
}
} else {
addLogEntry("Unknown key in config file: " ~ key);
@ -1756,7 +1769,7 @@ class ApplicationConfig {
bool resyncRequired = false;
// Consolidate the flags for different configuration changes
bool[9] configOptionsDifferent;
bool[11] configOptionsDifferent;
// Handle multiple entries of skip_file
string backupConfigFileSkipFile;
@ -1790,19 +1803,23 @@ class ApplicationConfig {
if (exists(configBackupFile)) {
string[string] backupConfigStringValues;
backupConfigStringValues["check_nosync"] = "";
backupConfigStringValues["drive_id"] = "";
backupConfigStringValues["sync_dir"] = "";
backupConfigStringValues["skip_file"] = "";
backupConfigStringValues["skip_dir"] = "";
backupConfigStringValues["skip_dotfiles"] = "";
backupConfigStringValues["skip_size"] = "";
backupConfigStringValues["skip_symlinks"] = "";
backupConfigStringValues["sync_business_shared_items"] = "";
bool check_nosync_present = false;
bool drive_id_present = false;
bool sync_dir_present = false;
bool skip_file_present = false;
bool skip_dir_present = false;
bool skip_dotfiles_present = false;
bool skip_size_present = false;
bool skip_symlinks_present = false;
bool sync_business_shared_items_present = false;
@ -1931,10 +1948,14 @@ class ApplicationConfig {
// We actually read a 'skip_file' configuration line from the 'config' file
if (!skip_file_present && configFileSkipFile != defaultSkipFile) logAndSetDifference("skip_file newly added ... --resync needed", 4);
}
// Other options
if (!skip_dir_present && configFileSkipDir != "") logAndSetDifference("skip_dir newly added ... --resync needed", 5);
if (!skip_dotfiles_present && configFileSkipDotfiles) logAndSetDifference("skip_dotfiles newly added ... --resync needed", 6);
if (!skip_symlinks_present && configFileSkipSymbolicLinks) logAndSetDifference("skip_symlinks newly added ... --resync needed", 7);
if (!sync_business_shared_items_present && configFileSyncBusinessSharedItems) logAndSetDifference("sync_business_shared_items newly added ... --resync needed", 8);
if (!check_nosync_present && configFileCheckNoSync) logAndSetDifference("check_nosync newly added ... --resync needed", 9);
if (!skip_size_present && configFileSkipSize) logAndSetDifference("skip_size newly added ... --resync needed", 10);
} else {
// failed to read backup config file
addLogEntry("WARNING: unable to read backup config, unable to validate if any changes made");
@ -1950,6 +1971,8 @@ class ApplicationConfig {
// --skip-dir ARG
// --skip-dot-files
// --skip-symlinks
// --check-for-nosync
// --skip-size ARG
// Check CLI options
if (exists(applicableConfigFilePath)) {
@ -1969,6 +1992,8 @@ class ApplicationConfig {
if (configFileSkipDir != "" && configFileSkipDir != getValueString("skip_dir")) logAndSetDifference("skip_dir: CLI override of config file option, --resync needed", 5);
if (!configFileSkipDotfiles && getValueBool("skip_dotfiles")) logAndSetDifference("skip_dotfiles: CLI override of config file option, --resync needed", 6);
if (!configFileSkipSymbolicLinks && getValueBool("skip_symlinks")) logAndSetDifference("skip_symlinks: CLI override of config file option, --resync needed", 7);
if (!configFileCheckNoSync && getValueBool("check_nosync")) logAndSetDifference("check_nosync: CLI override of config file option, --resync needed", 9);
if (!configFileSkipSize && (getValueLong("skip_size") > 0)) logAndSetDifference("skip_size: CLI override of config file option, --resync needed", 10);
}
// Aggregate the result to determine if a resync is required