deblan-mirror/abraunegg-onedrive
deblan-mirror/abraunegg-onedrive
1
0
Fork 0
mirror of https://github.com/abraunegg/onedrive synced 2026-03-14 14:35:46 +01:00
Code Issues Projects Releases Wiki Activity

intercept curl exceptions

Browse source
This commit is contained in:
skilion 2015-12-29 19:38:15 +01:00
commit c2b0b7f733
2 changed files with 16 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/onedrive.d
View file

@ -1,7 +1,9 @@
import std.datetime, std.exception, std.json, std.net.curl, std.path;
import std.net.curl: CurlException, HTTP;
import std.datetime, std.exception, std.json, std.path;
import std.stdio, std.string, std.uni, std.uri;
import config;
private immutable {
string authUrl = "https://login.live.com/oauth20_authorize.srf";
string redirectUrl = "https://login.live.com/oauth20_desktop.srf";
@ -15,6 +17,11 @@ class OneDriveException: Exception
// HTTP status code
int code;
@nogc @safe pure nothrow this(string msg, Throwable next, string file = __FILE__, size_t line = __LINE__)
{
super(msg, file, line, next);
}
@safe pure this(int code, string reason, string file = __FILE__, size_t line = __LINE__)
{
this.code = code;
@ -117,7 +124,7 @@ final class OneDriveApi
return patch(url, data.toString());
}
//https://dev.onedrive.com/items/delete.htm
// https://dev.onedrive.com/items/delete.htm
void deleteById(const(char)[] id, const(char)[] eTag = null)
{
checkAccessTokenExpired();
@ -126,7 +133,7 @@ final class OneDriveApi
del(url);
}
//https://dev.onedrive.com/items/create.htm
// https://dev.onedrive.com/items/create.htm
JSONValue createByPath(const(char)[] parentPath, JSONValue item)
{
string url = itemByPathUrl ~ encodeComponent(parentPath) ~ ":/children";
@ -316,7 +323,11 @@ final class OneDriveApi
content ~= data;
return data.length;
};
http.perform();
try {
http.perform();
} catch (CurlException e) {
throw new OneDriveException(e.msg, e);
}
return content.parseJSON();
}

2
src/sync.d
View file

@ -54,7 +54,7 @@ final class SyncEngine
private UploadSession session;
// token representing the last status correctly synced
private string statusToken;
// list of items to skip while applying the changes downloaded
// list of items to skip while applying the changes
private string[] skippedItems;
// list of items to delete after the changes has been downloaded
private string[] pathsToDelete;