deblan-mirror/abraunegg-onedrive
deblan-mirror/abraunegg-onedrive
1
0
Fork 0
mirror of https://github.com/abraunegg/onedrive synced 2024-05-10 09:46:40 +02:00
Code Issues Projects Releases Wiki Activity

Handle Item not found exception when unable to query OneDrive 'root' for changes (#336)

Browse source 
* Add a 404 error handler when OneDrive cannot query what changes are available for a particular 'root' folder id
* Add additional verbose debug logging to assist in the future
* Change to not throw an exception when OneDrive cannot query what changes are available for a particular 'root' folder - rather display some meaningful details instead of crashing the application
* As we know the actual 'items.sqlite3' location, display that as the file to remove rather than a 'generic' message as this is more helpful
This commit is contained in:
abraunegg 2019-01-11 05:31:10 +11:00 committed by GitHub
parent d527b7ef26
commit 1d902a5beb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 30 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/sync.d
View file

@ -516,11 +516,26 @@ final class SyncEngine
// Use the 'id' that was passed in (folderId)
idToQuery = id;
}
try {
// Fetch the changes relative to the path id we want to query
changes = onedrive.viewChangesById(driveId, idToQuery, deltaLink);
} catch (OneDriveException e) {
// OneDrive threw an error
log.vdebug("OneDrive threw an error when querying for these changes:");
log.vdebug("driveId: ", driveId);
log.vdebug("idToQuery: ", idToQuery);
log.vdebug("deltaLink: ", deltaLink);
// HTTP request returned status code 404 (Not Found)
if (e.httpStatusCode == 404) {
// Stop application
log.log("\n\nOneDrive returned a 'HTTP 404 - Item not found'");
log.log("The item id to query was not found on OneDrive");
log.log("\nRemove your '", cfg.databaseFilePath, "' file and try to sync again\n");
return;
}
// HTTP request returned status code 410 (The requested resource is no longer available at the server)
if (e.httpStatusCode == 410) {
log.vlog("Delta link expired, re-syncing...");
@ -528,12 +543,12 @@ final class SyncEngine
continue;
}
// HTTP request returned status code 500 (Internal Server Error)
if (e.httpStatusCode == 500) {
// HTTP request returned status code 500 (Internal Server Error)
// Exit Application
// Stop application
log.log("\n\nOneDrive returned a 'HTTP 500 - Internal Server Error'");
log.log("This is a OneDrive API Bug - https://github.com/OneDrive/onedrive-api-docs/issues/844\n\n");
log.log("Remove your 'items.sqlite3' file and try to sync again\n\n");
log.log("\nRemove your '", cfg.databaseFilePath, "' file and try to sync again\n");
return;
}
@ -544,7 +559,17 @@ final class SyncEngine
applyDifferences(driveId, idToQuery);
}
else throw e;
else {
// Default operation if not 404, 410, 500, 504 errors
log.log("\n\nOneDrive returned an error with the following message:\n");
auto errorArray = splitLines(e.msg);
log.log("Error Message: ", errorArray[0]);
// extract 'message' as the reason
JSONValue errorMessage = parseJSON(replace(e.msg, errorArray[0], ""));
log.log("Error Reason: ", errorMessage["error"]["message"].str);
log.log("\nRemove your '", cfg.databaseFilePath, "' file and try to sync again\n");
return;
}
}
// Are there any changes to process?