haeaeae/duplicati
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moved content api strings to webapi.

Browse Source
This commit is contained in:
verhoek
2018-10-23 16:21:36 +02:00
parent 1db6504dea
commit 0752e0af0d
2 changed files with 32 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Duplicati/Library/Backend/Dropbox/DropboxHelper.cs
+6 -10
View File
@@ -10,7 +10,6 @@ namespace Duplicati.Library.Backend
{
public class DropboxHelper : OAuthHelper
{
internal const string CONTENT_API_URL = "https://content.dropboxapi.com/2";
private const int DROPBOX_MAX_CHUNK_UPLOAD = 10 * 1024 * 1024; // 10 MB max upload
private const string API_ARG_HEADER = "DROPBOX-API-arg";
@@ -76,8 +75,7 @@ namespace Duplicati.Library.Backend
var chunksize = (int)Math.Min(DROPBOX_MAX_CHUNK_UPLOAD, stream.Length);
var url = string.Format("{0}/files/upload_session/start", CONTENT_API_URL);
var req = CreateRequest(url, "POST");
var req = CreateRequest(WebApi.Dropbox.UploadSessionStartUrl(), "POST");
req.Headers[API_ARG_HEADER] = JsonConvert.SerializeObject(ussa);
req.ContentType = "application/octet-stream";
req.ContentLength = chunksize;
@@ -114,11 +112,10 @@ namespace Duplicati.Library.Backend
usaa.cursor.session_id = ussr.session_id;
usaa.cursor.offset = globalBytesRead;
usaa.close = remaining < DROPBOX_MAX_CHUNK_UPLOAD;
url = string.Format("{0}/files/upload_session/append_v2", CONTENT_API_URL);
chunksize = (int)Math.Min(DROPBOX_MAX_CHUNK_UPLOAD, (long)remaining);
req = CreateRequest(url, "POST");
req = CreateRequest(WebApi.Dropbox.UploadSessionAppendUrl(), "POST");
req.Headers[API_ARG_HEADER] = JsonConvert.SerializeObject(usaa);
req.ContentType = "application/octet-stream";
req.ContentLength = chunksize;
@@ -154,8 +151,7 @@ namespace Duplicati.Library.Backend
usfa.cursor.offset = (ulong)globalBytesRead;
usfa.commit.path = path;
url = string.Format("{0}/files/upload_session/finish", CONTENT_API_URL);
req = CreateRequest(url, "POST");
req = CreateRequest(WebApi.Dropbox.UploadSessionFinishUrl(), "POST");
req.Headers[API_ARG_HEADER] = JsonConvert.SerializeObject(usfa);
req.ContentType = "application/octet-stream";
req.Timeout = 200000;
@@ -173,9 +169,9 @@ namespace Duplicati.Library.Backend
{
try
{
var pa = new PathArg() { path = path };
var url = string.Format("{0}/files/download", CONTENT_API_URL);
var req = CreateRequest(url, "POST");
var pa = new PathArg { path = path };
var req = CreateRequest(WebApi.Dropbox.DownloadFilesUrl(), "POST");
req.Headers[API_ARG_HEADER] = JsonConvert.SerializeObject(pa);
using (var response = GetResponse(req))
Duplicati/Library/Backend/Dropbox/WebApi.cs
+26
View File
@@ -41,6 +41,26 @@ namespace Duplicati.Library.Backend.WebApi
return Uri.UriBuilder(Url.API, Path.DeleteFolder);
}
public static string UploadSessionStartUrl()
{
return Uri.UriBuilder(Url.CONTENT_API_URL, Path.UploadSessionStart);
}
public static string UploadSessionAppendUrl()
{
return Uri.UriBuilder(Url.CONTENT_API_URL, Path.UploadSessionAppend);
}
public static string UploadSessionFinishUrl()
{
return Uri.UriBuilder(Url.CONTENT_API_URL, Path.UploadSessionFinish);
}
public static string DownloadFilesUrl()
{
return Uri.UriBuilder(Url.CONTENT_API_URL, Path.DownloadFiles);
}
public static string[] Hosts()
{
return new[] { new System.Uri(Url.API).Host, new System.Uri(Url.CONTENT_API_URL).Host };
@@ -59,6 +79,12 @@ namespace Duplicati.Library.Backend.WebApi
public const string DeleteFolder = "files/delete";
public const string ListFolder = "files/list_folder";
public const string ListFolderContinue = "files/list_folder/continue";
public const string UploadSessionStart = "files/upload_session/start";
public const string UploadSessionAppend = "files/upload_session/append_v2";
public const string UploadSessionFinish = "files/upload_session/finish";
public const string DownloadFiles = "files/upload_session/finish";
}
}