From f8830ba4d8827a9460de51e17ccd8caeed7217e2 Mon Sep 17 00:00:00 2001
From: Alexander Lantsev <aunsane@gmail.com>
Date: Wed, 13 May 2015 20:12:06 +0000
Subject: Dropbox: some fixes

git-svn-id: http://svn.miranda-ng.org/main/trunk@13577 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/Dropbox/src/api/operations.h | 16 ++++++++--------
 plugins/Dropbox/src/api/upload.h     |  8 ++++----
 2 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'plugins/Dropbox/src/api')

diff --git a/plugins/Dropbox/src/api/operations.h b/plugins/Dropbox/src/api/operations.h
index 56578515b3..b94d90b4e7 100644
--- a/plugins/Dropbox/src/api/operations.h
+++ b/plugins/Dropbox/src/api/operations.h
@@ -4,8 +4,8 @@
 class ShareRequest : public HttpRequest
 {
 public:
-	ShareRequest(const char *token, const char *path, bool useShortUrl = true) :
-		HttpRequest(REQUEST_POST, FORMAT, DROPBOX_API_URL "/shares/auto/%s", path)
+	ShareRequest(const char *token, const char *path, bool useShortUrl = true, const char *root = "auto") :
+		HttpRequest(REQUEST_POST, FORMAT, DROPBOX_API_URL "/shares/%s/%s", root, path)
 	{
 		if (!useShortUrl)
 			AddUrlParameter("short_url=false");
@@ -18,13 +18,13 @@ public:
 class DeleteRequest : public HttpRequest
 {
 public:
-	DeleteRequest(const char *token, const char *path) :
+	DeleteRequest(const char *token, const char *path, const char *root = "auto") :
 		HttpRequest(REQUEST_POST, DROPBOX_API_URL "/fileops/delete")
 	{
 		AddBearerAuthHeader(token);
 		AddHeader("Content-Type", "application/x-www-form-urlencoded");
 
-		CMStringA data(CMStringDataFormat::FORMAT, "root=auto&path=%s", path);
+		CMStringA data(CMStringDataFormat::FORMAT, "root=%s&path=%s", root, path);
 		data.Replace('\\', '/');
 		SetData(data.GetBuffer(), data.GetLength());
 	}
@@ -33,13 +33,13 @@ public:
 class CreateFolderRequest : public HttpRequest
 {
 public:
-	CreateFolderRequest(const char *token, const char *path) :
+	CreateFolderRequest(const char *token, const char *path, const char *root = "auto") :
 		HttpRequest(REQUEST_POST, DROPBOX_API_URL "/fileops/create_folder")
 	{
 		AddBearerAuthHeader(token);
 		AddHeader("Content-Type", "application/x-www-form-urlencoded");
 
-		CMStringA data(CMStringDataFormat::FORMAT, "root=auto&path=%s", path);
+		CMStringA data(CMStringDataFormat::FORMAT, "root=%s&path=%s", root, path);
 		data.Replace('\\', '/');
 		SetData(data.GetBuffer(), data.GetLength());
 	}
@@ -48,8 +48,8 @@ public:
 class GetMetadataRequest : public HttpRequest
 {
 public:
-	GetMetadataRequest(const char *token, const char *path) :
-		HttpRequest(REQUEST_GET, FORMAT, DROPBOX_API_URL "/metadata/auto/%s", path)
+	GetMetadataRequest(const char *token, const char *path, const char *root = "auto") :
+		HttpRequest(REQUEST_GET, FORMAT, DROPBOX_API_URL "/metadata/%s/%s", root, path)
 	{
 		AddBearerAuthHeader(token);
 	}
diff --git a/plugins/Dropbox/src/api/upload.h b/plugins/Dropbox/src/api/upload.h
index 5c2e41c792..a871940e20 100644
--- a/plugins/Dropbox/src/api/upload.h
+++ b/plugins/Dropbox/src/api/upload.h
@@ -4,8 +4,8 @@
 class UploadFileRequest : public HttpRequest
 {
 public:
-	UploadFileRequest(const char *token, const char *fileName, const char *data, int length) :
-		HttpRequest(REQUEST_PUT, FORMAT, DROPBOX_APICONTENT_URL "/files_put/auto/%s", fileName)
+	UploadFileRequest(const char *token, const char *fileName, const char *data, int length, const char *root = "auto") :
+		HttpRequest(REQUEST_PUT, FORMAT, DROPBOX_APICONTENT_URL "/files_put/%s/%s", root, fileName)
 	{
 		AddBearerAuthHeader(token);
 		pData = (char*)data;
@@ -34,8 +34,8 @@ public:
 		dataLength = length;
 	}
 
-	UploadFileChunkRequest(const char *token, const char *uploadId, const char *path) :
-		HttpRequest(REQUEST_POST, FORMAT, DROPBOX_APICONTENT_URL "/commit_chunked_upload/auto/%s", path)
+	UploadFileChunkRequest(const char *token, const char *uploadId, const char *path, const char *root = "auto") :
+		HttpRequest(REQUEST_POST, FORMAT, DROPBOX_APICONTENT_URL "/commit_chunked_upload/%s/%s", root, path)
 	{
 		AddBearerAuthHeader(token);
 		AddHeader("Content-Type", "application/x-www-form-urlencoded");
-- 
cgit v1.2.3