deblan-mirror/abraunegg-onedrive
deblan-mirror/abraunegg-onedrive
1
0
Fork 0
mirror of https://github.com/abraunegg/onedrive synced 2024-06-07 08:22:13 +02:00
Code Issues Projects Releases Wiki Activity

Update sync.d

Browse source 
* Full fix
This commit is contained in:
abraunegg 2020-11-13 08:27:09 +11:00
parent b57bb3fde5
commit b59596523e
1 changed files with 31 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
src/sync.d
View file

@ -2006,25 +2006,31 @@ final class SyncEngine
// - full path + combination of any above two - /path/name*.txt // - full path + combination of any above two - /path/name*.txt
// - full path to file - /path/to/file.txt // - full path to file - /path/to/file.txt
// need to compute the full path for this file // is the parent id in the database?
path = itemdb.computePath(item.driveId, item.parentId) ~ "/" ~ item.name; if (itemdb.idInLocalDatabase(item.driveId, item.parentId)){
// need to compute the full path for this file
// The path that needs to be checked needs to include the '/' path = itemdb.computePath(item.driveId, item.parentId) ~ "/" ~ item.name;
// This due to if the user has specified in skip_file an exclusive path: '/path/file' - that is what must be matched
if (!startsWith(path, "/")){ // The path that needs to be checked needs to include the '/'
// Add '/' to the path // This due to if the user has specified in skip_file an exclusive path: '/path/file' - that is what must be matched
path = '/' ~ path; if (!startsWith(path, "/")){
// Add '/' to the path
path = '/' ~ path;
}
log.vdebug("skip_file item to check: ", path);
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");
} }
log.vdebug("skip_file item to check: ", path);
unwanted = selectiveSync.isFileNameExcluded(path);
log.vdebug("Result: ", unwanted);
if (unwanted) log.vlog("Skipping item - excluded by skip_file config: ", item.name);
} }
} }
// check the item type // check the item type
if (!unwanted) { if (!unwanted) {
if (isItemFile(driveItem)) { if (isItemFile(driveItem)) {
log.vdebug("The item we are syncing is a file"); log.vdebug("The item we are syncing is a file");
@ -2238,6 +2244,14 @@ final class SyncEngine
} }
// What was the item that was saved // What was the item that was saved
log.vdebug("item details: ", item); 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) { } catch (FileException e) {
// display the error message // display the error message
displayFileSystemErrorMessage(e.msg); displayFileSystemErrorMessage(e.msg);
// flag that this failed
downloadFailed = true;
return;
} }
} else { } else {
// we dont create the directory, but we need to track that we 'faked it' // we dont create the directory, but we need to track that we 'faked it'