Update sync.d

* Full fix
This commit is contained in:
abraunegg 2020-11-13 08:27:09 +11:00
parent b57bb3fde5
commit b59596523e

View file

@ -2006,6 +2006,8 @@ final class SyncEngine
// - full path + combination of any above two - /path/name*.txt
// - full path to file - /path/to/file.txt
// is the parent id in the database?
if (itemdb.idInLocalDatabase(item.driveId, item.parentId)){
// need to compute the full path for this file
path = itemdb.computePath(item.driveId, item.parentId) ~ "/" ~ item.name;
@ -2020,11 +2022,15 @@ final class SyncEngine
unwanted = selectiveSync.isFileNameExcluded(path);
log.vdebug("Result: ", unwanted);
if (unwanted) log.vlog("Skipping item - excluded by skip_file config: ", item.name);
} else {
// parent id is not in the database
unwanted = true;
log.vlog("Skipping item - parent not present in local database");
}
}
}
// check the item type
if (!unwanted) {
if (isItemFile(driveItem)) {
log.vdebug("The item we are syncing is a file");
@ -2238,6 +2244,14 @@ final class SyncEngine
}
// What was the item that was saved
log.vdebug("item details: ", item);
} else {
// flag was tripped, which was it
if (downloadFailed) {
log.vdebug("Download or creation of local directory failed");
}
if (malwareDetected) {
log.vdebug("OneDrive reported that file contained malware");
}
}
}
@ -2431,6 +2445,9 @@ final class SyncEngine
} catch (FileException e) {
// display the error message
displayFileSystemErrorMessage(e.msg);
// flag that this failed
downloadFailed = true;
return;
}
} else {
// we dont create the directory, but we need to track that we 'faked it'