deblan-mirror/abraunegg-onedrive
deblan-mirror/abraunegg-onedrive
1
0
Fork 0
mirror of https://github.com/abraunegg/onedrive synced 2024-05-18 13:46:41 +02:00
Code Issues Projects Releases Wiki Activity

Only call isPathExcludedViaSyncList if 'sync_list' is enabled where possible (#2213)

Browse source 
* Only check 'sync_list' if this has been enabled and configured, otherwise do not undertake a check as it is computationally redundant where possible
This commit is contained in:
abraunegg 2022-11-10 16:58:54 +11:00 committed by GitHub
parent 941e1e215d
commit 0ec1c95e4a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 42 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
src/sync.d
View file

@ -2256,9 +2256,13 @@ final class SyncEngine
log.vdebug("This item was previously synced / seen by the client"); log.vdebug("This item was previously synced / seen by the client");
if (("name" in driveItem["parentReference"]) != null) { if (("name" in driveItem["parentReference"]) != null) {
// How is this out of scope? // How is this out of scope?
if (selectiveSync.isPathExcludedViaSyncList(driveItem["parentReference"]["name"].str)) { // is sync_list configured
// Previously synced item is now out of scope as it has been moved out of what is included in sync_list if (syncListConfigured) {
log.vdebug("This previously synced item is now excluded from being synced due to sync_list exclusion"); // sync_list configured and in use
if (selectiveSync.isPathExcludedViaSyncList(driveItem["parentReference"]["name"].str)) {
// Previously synced item is now out of scope as it has been moved out of what is included in sync_list
log.vdebug("This previously synced item is now excluded from being synced due to sync_list exclusion");
}
} }
// flag to delete local file as it now is no longer in sync with OneDrive // flag to delete local file as it now is no longer in sync with OneDrive
log.vdebug("Flagging to delete item locally"); log.vdebug("Flagging to delete item locally");
@ -2356,13 +2360,15 @@ final class SyncEngine
// The path that needs to be checked needs to include the '/' // The path that needs to be checked needs to include the '/'
// This due to if the user has specified in skip_file an exclusive path: '/path/file' - that is what must be matched // This due to if the user has specified in skip_file an exclusive path: '/path/file' - that is what must be matched
// However, as 'path' used throughout, use a temp variable with this modification so that we use the temp variable for exclusion checks
string exclusionTestPath = "";
if (!startsWith(path, "/")){ if (!startsWith(path, "/")){
// Add '/' to the path // Add '/' to the path
path = '/' ~ path; exclusionTestPath = '/' ~ path;
} }
log.vdebug("skip_file item to check: ", path); log.vdebug("skip_file item to check: ", exclusionTestPath);
unwanted = selectiveSync.isFileNameExcluded(path); unwanted = selectiveSync.isFileNameExcluded(exclusionTestPath);
log.vdebug("Result: ", unwanted); log.vdebug("Result: ", unwanted);
if (unwanted) log.vlog("Skipping item - excluded by skip_file config: ", item.name); if (unwanted) log.vlog("Skipping item - excluded by skip_file config: ", item.name);
} else { } else {
@ -2405,16 +2411,15 @@ final class SyncEngine
if (!unwanted) { if (!unwanted) {
// Is the item parent in the local database? // Is the item parent in the local database?
if (itemdb.idInLocalDatabase(item.driveId, item.parentId)){ if (itemdb.idInLocalDatabase(item.driveId, item.parentId)){
// compute the item path to see if the path is excluded & need the full path for this file // parent item is in the local database
log.vdebug("sync_list item to check: ", path); // compute the item path if empty
if (path.empty) { if (path.empty) {
path = computeItemPath(item.driveId, item.parentId) ~ "/" ~ item.name; path = computeItemPath(item.driveId, item.parentId) ~ "/" ~ item.name;
} }
path = buildNormalizedPath(path); // what path are we checking
log.vdebug("sync_list item to check: ", path);
// 'path' at this stage must not start with '/'
path = path.strip('/'); // Unfortunatly there is no avoiding this call to check if the path is excluded|included via sync_list
if (selectiveSync.isPathExcludedViaSyncList(path)) { if (selectiveSync.isPathExcludedViaSyncList(path)) {
// selective sync advised to skip, however is this a file and are we configured to upload / download files in the root? // selective sync advised to skip, however is this a file and are we configured to upload / download files in the root?
if ((isItemFile(driveItem)) && (cfg.getValueBool("sync_root_files")) && (rootName(path) == "") ) { if ((isItemFile(driveItem)) && (cfg.getValueBool("sync_root_files")) && (rootName(path) == "") ) {
@ -2467,9 +2472,6 @@ final class SyncEngine
} }
} }
// 'path' at this stage must not start with '/'
path = path.strip('/');
// skip downloading dot files if configured // skip downloading dot files if configured
if (cfg.getValueBool("skip_dotfiles")) { if (cfg.getValueBool("skip_dotfiles")) {
if (isDotFile(path)) { if (isDotFile(path)) {
@ -2639,7 +2641,7 @@ final class SyncEngine
if (!exists(readLink(path))) { if (!exists(readLink(path))) {
// reading the symbolic link failed // reading the symbolic link failed
log.vdebug("Reading the symbolic link target failed ........ "); log.vdebug("Reading the symbolic link target failed ........ ");
log.logAndNotify("Skipping item - invalid local symbolic link: ", path); log.logAndNotify("Skipping item - invalid symbolic link: ", path);
return; return;
} }
} }
@ -2806,7 +2808,7 @@ final class SyncEngine
// Issue #658 handling - is sync_list in use? // Issue #658 handling - is sync_list in use?
if (syncListConfigured) { if (syncListConfigured) {
// sync_list in use // sync_list configured and in use
// path to create was previously checked if this should be included / excluded. No need to check again. // path to create was previously checked if this should be included / excluded. No need to check again.
log.vdebug("Issue #658 handling"); log.vdebug("Issue #658 handling");
setOneDriveFullScanTrigger(); setOneDriveFullScanTrigger();
@ -3614,8 +3616,12 @@ final class SyncEngine
// If path or filename does not exclude, is this excluded due to use of selective sync? // If path or filename does not exclude, is this excluded due to use of selective sync?
if (!unwanted) { if (!unwanted) {
// Is the path excluded via sync_list? // is sync_list configured
unwanted = selectiveSync.isPathExcludedViaSyncList(path); if (syncListConfigured) {
// sync_list configured and in use
// Is the path excluded via sync_list?
unwanted = selectiveSync.isPathExcludedViaSyncList(path);
}
} }
// skip unwanted items // skip unwanted items
@ -4394,19 +4400,23 @@ final class SyncEngine
} }
} }
if (selectiveSync.isPathExcludedViaSyncList(path)) { // is sync_list configured
if ((isFile(path)) && (cfg.getValueBool("sync_root_files")) && (rootName(path.strip('.').strip('/')) == "")) { if (syncListConfigured) {
log.vdebug("Not skipping path due to sync_root_files inclusion: ", path); // sync_list configured and in use
} else { if (selectiveSync.isPathExcludedViaSyncList(path)) {
string userSyncList = cfg.configDirName ~ "/sync_list"; if ((isFile(path)) && (cfg.getValueBool("sync_root_files")) && (rootName(path.strip('.').strip('/')) == "")) {
if (exists(userSyncList)){ log.vdebug("Not skipping path due to sync_root_files inclusion: ", path);
// skipped most likely due to inclusion in sync_list
log.vlog("Skipping item - excluded by sync_list config: ", path);
return;
} else { } else {
// skipped for some other reason string userSyncList = cfg.configDirName ~ "/sync_list";
log.vlog("Skipping item - path excluded by user config: ", path); if (exists(userSyncList)){
return; // skipped most likely due to inclusion in sync_list
log.vlog("Skipping item - excluded by sync_list config: ", path);
return;
} else {
// skipped for some other reason
log.vlog("Skipping item - path excluded by user config: ", path);
return;
}
} }
} }
} }