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

make makeItem() more resiliant

Browse source
This commit is contained in:
skilion 2017-06-15 13:45:14 +02:00
parent 9e2123249a
commit 3529a4f78b
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/sync.d
View file

@ -54,7 +54,7 @@ private Item makeItem(const ref JSONValue jsonItem)
type: type, type: type,
eTag: isItemRoot(jsonItem) ? null : jsonItem["eTag"].str, // eTag is not returned for the root in OneDrive Biz eTag: isItemRoot(jsonItem) ? null : jsonItem["eTag"].str, // eTag is not returned for the root in OneDrive Biz
cTag: "cTag" !in jsonItem ? null : jsonItem["cTag"].str, // cTag is missing in old files (plus all folders) cTag: "cTag" !in jsonItem ? null : jsonItem["cTag"].str, // cTag is missing in old files (plus all folders)
mtime: isItemRemote(jsonItem) ? SysTime(0) : SysTime.fromISOExtString(jsonItem["fileSystemInfo"]["lastModifiedDateTime"].str), mtime: "fileSystemInfo" in jsonItem ? SysTime.fromISOExtString(jsonItem["fileSystemInfo"]["lastModifiedDateTime"].str) : SysTime(0),
parentDriveId: isItemRoot(jsonItem) ? null : jsonItem["parentReference"]["driveId"].str, parentDriveId: isItemRoot(jsonItem) ? null : jsonItem["parentReference"]["driveId"].str,
parentId: isItemRoot(jsonItem) ? null : jsonItem["parentReference"]["id"].str parentId: isItemRoot(jsonItem) ? null : jsonItem["parentReference"]["id"].str
}; };
@ -71,9 +71,6 @@ private Item makeItem(const ref JSONValue jsonItem)
} else { } else {
log.vlog("The file does not have any hash"); log.vlog("The file does not have any hash");
} }
} else {
// 'hashes' is missing in old files
log.vlog("No hashes facet");
} }
} }
@ -148,7 +145,7 @@ final class SyncEngine
} catch (FileException e) { } catch (FileException e) {
// swallow exception // swallow exception
} }
try { try {
JSONValue changes; JSONValue changes;
do { do {
@ -189,8 +186,8 @@ final class SyncEngine
private void applyDifference(JSONValue jsonItem) private void applyDifference(JSONValue jsonItem)
{ {
log.vlog(jsonItem["id"].str, " ", jsonItem["name"].str);
Item item = makeItem(jsonItem); Item item = makeItem(jsonItem);
log.vlog(item.id, " ", item.name);
string path = "."; string path = ".";
bool unwanted; bool unwanted;