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

Resolve 'Key not found: path' when syncing from some shared folders (#211)

Browse source 
* Add a check to validate if the parentReference object has a path object
* Fix spelling error - trough -> through
* Only upload changes on remote folder if the item is in the database - dont assert if false
This commit is contained in:
abraunegg 2018-10-30 06:20:52 +11:00 committed by GitHub
parent 76ac8d3a24
commit eb2cbfd0a8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/sync.d
View file

@ -45,6 +45,11 @@ private bool hasParentReferenceId(const ref JSONValue item)
return ("id" in item["parentReference"]) != null;
}
private bool hasParentReferencePath(const ref JSONValue item)
{
return ("path" in item["parentReference"]) != null;
}
private bool isMalware(const ref JSONValue item)
{
return ("malware" in item) != null;
@ -459,9 +464,11 @@ final class SyncEngine
if (item["parentReference"]["driveId"].str != defaultDriveId) {
// The change parentReference driveId does not match the defaultDriveId - this could be a Shared Folder root item
string sharedDriveRootPath = "/drives/" ~ item["parentReference"]["driveId"].str ~ "/root:";
if (item["parentReference"]["path"].str == sharedDriveRootPath) {
// The drive path matches what a shared folder root item would equal
isRoot = true;
if (hasParentReferencePath(item)) {
if (item["parentReference"]["path"].str == sharedDriveRootPath) {
// The drive path matches what a shared folder root item would equal
isRoot = true;
}
}
}
}
@ -473,7 +480,11 @@ final class SyncEngine
applyDifference(item, driveId, isRoot);
} else {
// What is this item's path?
thisItemPath = item["parentReference"]["path"].str;
if (hasParentReferencePath(item)) {
thisItemPath = item["parentReference"]["path"].str;
} else {
thisItemPath = "";
}
// Check this item's path to see if this is a change on the path we want:
// 1. 'item id' matches 'id'
// 2. 'parentReference id' matches 'id'
@ -898,7 +909,7 @@ final class SyncEngine
uploadNewFile(path);
} else {
log.vlog("The directory has not changed");
// loop trough the children
// loop through the children
foreach (Item child; itemdb.selectChildren(item.driveId, item.id)) {
uploadDifferences(child);
}
@ -924,12 +935,14 @@ final class SyncEngine
uploadNewFile(path);
} else {
log.vlog("The directory has not changed");
// continue trough the linked folder
// continue through the linked folder
assert(item.remoteDriveId && item.remoteId);
Item remoteItem;
bool found = itemdb.selectById(item.remoteDriveId, item.remoteId, remoteItem);
assert(found);
uploadDifferences(remoteItem);
if(found){
// item was found in the database
uploadDifferences(remoteItem);
}
}
} else {
log.vlog("The directory has been deleted");