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

Update skip_dir config handling (#418)

Browse source 
* Original skip_dir handling expected an explicit match to path to match. With this patch, wildcard matching for any directory matching the path entry will be skipped
This commit is contained in:
abraunegg 2019-03-22 05:30:32 +11:00 committed by GitHub
parent 6b8b51a7cc
commit f2e007a1d7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/selective.d
View file

@ -39,7 +39,19 @@ final class SelectiveSync
// Does the directory name match skip_dir config entry?
// Returns true if the name matches a skip_dir config entry
// Returns false if no match
return !name.matchFirst(dirmask).empty;
// Try full path match first
if (!name.matchFirst(dirmask).empty) {
return true;
} else {
// check just the file name
string filename = baseName(name);
if(!filename.matchFirst(dirmask).empty) {
return true;
}
}
// no match
return false;
}
// config file skip_file parameter

2
src/sync.d
View file

@ -1485,12 +1485,14 @@ final class SyncEngine
// filter out user configured items to skip
if (path != ".") {
if (isDir(path)) {
log.vdebug("Checking path: ", path);
if (selectiveSync.isDirNameExcluded(strip(path,"./"))) {
log.vlog("Skipping item - excluded by skip_dir config: ", path);
return;
}
}
if (isFile(path)) {
log.vdebug("Checking file: ", path);
if (selectiveSync.isFileNameExcluded(strip(path,"./"))) {
log.vlog("Skipping item - excluded by skip_file config: ", path);
return;