deblan-mirror/abraunegg-onedrive
deblan-mirror/abraunegg-onedrive
1
0
Fork 0
mirror of https://github.com/abraunegg/onedrive synced 2024-06-09 01:12:29 +02:00
Code Issues Projects Releases Wiki Activity

Update 412 Error Handling

Browse source 
* Update 412 Error Handling based on local testing to ensure the 412 reponse is gracefully handled & the modified file is uploaded to OneDrive sucessfully as a new file
This commit is contained in:
abraunegg 2018-07-15 15:16:23 +10:00
parent 6dad811848
commit 6567624acb
2 changed files with 21 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/onedrive.d
View file

@ -540,8 +540,12 @@ final class OneDriveApi
private void checkHttpCode(ref const JSONValue response)
{
if (http.statusLine.code / 100 != 2) {
throw new OneDriveException(http.statusLine.code, http.statusLine.reason, response);
if (http.statusLine.code == 412) {
throw new OneDriveException(http.statusLine.code, http.statusLine.reason);
} else {
if (http.statusLine.code / 100 != 2) {
throw new OneDriveException(http.statusLine.code, http.statusLine.reason, response);
}
}
}
}

27
src/sync.d
View file

@ -824,7 +824,7 @@ final class SyncEngine
string eTag = item.eTag;
if (!testFileHash(path, item)) {
log.vlog("The file content has changed");
write("Uploading file ", path, " ...");
write("Uploading file ", path, " ... ");
JSONValue response;
// Are we using OneDrive Personal or OneDrive Business?
@ -846,25 +846,28 @@ final class SyncEngine
log.fileOnly(path, " is currently checked out or locked for editing by another user.");
return;
}
if (e.httpStatusCode == 412) {
// HTTP request returned status code 412
// ETag does not match current item's value
string nullTag = null;
response = onedrive.simpleUploadReplace(path, item.driveId, item.id, nullTag);
// HTTP request returned status code 412 - ETag does not match current item's value
// Remove the offending file from OneDrive - file will be uploaded as a new file
onedrive.deleteById(item.driveId, item.id, item.eTag);
// Delete from the local database
itemdb.deleteById(item.driveId, item.id);
}
if (e.httpStatusCode == 504) {
// HTTP request returned status code 504 (Gateway Timeout)
// Try upload as a session
response = session.upload(path, item.driveId, item.parentId, baseName(path), eTag);
response = session.upload(path, item.driveId, item.parentId, baseName(path), item.eTag);
}
else throw e;
}
writeln(" done.");
writeln("done.");
} else {
writeln("");
response = session.upload(path, item.driveId, item.parentId, baseName(path), eTag);
writeln(" done.");
}
response = session.upload(path, item.driveId, item.parentId, baseName(path), item.eTag);
writeln("done.");
}
} else {
// OneDrive Business Account - always use a session to upload
writeln("");
@ -885,12 +888,12 @@ final class SyncEngine
}
}
writeln(" done.");
writeln("done.");
// As the session.upload includes the last modified time, save the response
saveItem(response);
}
log.fileOnly("Uploading file ", path, " ... done.");
// use the cTag instead of the eTag because Onedrive may update the metadata of files AFTER they have been uploaded
// use the cTag instead of the eTag because OneDrive may update the metadata of files AFTER they have been uploaded
eTag = response["cTag"].str;
}
if (accountType == "personal"){