aboutsummaryrefslogtreecommitdiff
path: root/backends/cloud/dropbox
diff options
context:
space:
mode:
Diffstat (limited to 'backends/cloud/dropbox')
-rw-r--r--backends/cloud/dropbox/dropboxcreatedirectoryrequest.cpp6
-rw-r--r--backends/cloud/dropbox/dropboxcreatedirectoryrequest.h2
-rw-r--r--backends/cloud/dropbox/dropboxinforequest.cpp4
-rw-r--r--backends/cloud/dropbox/dropboxinforequest.h2
-rw-r--r--backends/cloud/dropbox/dropboxlistdirectoryrequest.cpp12
-rw-r--r--backends/cloud/dropbox/dropboxlistdirectoryrequest.h2
-rw-r--r--backends/cloud/dropbox/dropboxstorage.cpp2
-rw-r--r--backends/cloud/dropbox/dropboxstorage.h6
-rw-r--r--backends/cloud/dropbox/dropboxuploadrequest.cpp24
-rw-r--r--backends/cloud/dropbox/dropboxuploadrequest.h2
10 files changed, 31 insertions, 31 deletions
diff --git a/backends/cloud/dropbox/dropboxcreatedirectoryrequest.cpp b/backends/cloud/dropbox/dropboxcreatedirectoryrequest.cpp
index 81ace75dda..6d228224d7 100644
--- a/backends/cloud/dropbox/dropboxcreatedirectoryrequest.cpp
+++ b/backends/cloud/dropbox/dropboxcreatedirectoryrequest.cpp
@@ -44,7 +44,7 @@ DropboxCreateDirectoryRequest::~DropboxCreateDirectoryRequest() {
void DropboxCreateDirectoryRequest::start() {
_ignoreCallback = true;
- if (_workingRequest) _workingRequest->finish();
+ if (_workingRequest) _workingRequest->finish();
_ignoreCallback = false;
Networking::JsonCallback innerCallback = new Common::Callback<DropboxCreateDirectoryRequest, Networking::JsonResponse>(this, &DropboxCreateDirectoryRequest::responseCallback);
@@ -74,13 +74,13 @@ void DropboxCreateDirectoryRequest::responseCallback(Networking::JsonResponse re
Networking::CurlJsonRequest *rq = (Networking::CurlJsonRequest *)response.request;
if (rq && rq->getNetworkReadStream())
error.httpResponseCode = rq->getNetworkReadStream()->httpResponseCode();
-
+
if (!json) {
warning("NULL passed instead of JSON");
finishError(error);
return;
}
-
+
Common::JSONObject info = json->asObject();
if (info.contains("id")) finishCreation(true);
else {
diff --git a/backends/cloud/dropbox/dropboxcreatedirectoryrequest.h b/backends/cloud/dropbox/dropboxcreatedirectoryrequest.h
index 4bdc6dbee6..0ef6a22a04 100644
--- a/backends/cloud/dropbox/dropboxcreatedirectoryrequest.h
+++ b/backends/cloud/dropbox/dropboxcreatedirectoryrequest.h
@@ -37,7 +37,7 @@ class DropboxCreateDirectoryRequest: public Networking::Request {
Request *_workingRequest;
bool _ignoreCallback;
Common::String _date;
-
+
void start();
void responseCallback(Networking::JsonResponse response);
void errorCallback(Networking::ErrorResponse error);
diff --git a/backends/cloud/dropbox/dropboxinforequest.cpp b/backends/cloud/dropbox/dropboxinforequest.cpp
index f5a14abe1c..e147ac58e2 100644
--- a/backends/cloud/dropbox/dropboxinforequest.cpp
+++ b/backends/cloud/dropbox/dropboxinforequest.cpp
@@ -45,7 +45,7 @@ DropboxInfoRequest::~DropboxInfoRequest() {
void DropboxInfoRequest::start() {
_ignoreCallback = true;
- if (_workingRequest) _workingRequest->finish();
+ if (_workingRequest) _workingRequest->finish();
_ignoreCallback = false;
Networking::JsonCallback innerCallback = new Common::Callback<DropboxInfoRequest, Networking::JsonResponse>(this, &DropboxInfoRequest::userResponseCallback);
@@ -70,7 +70,7 @@ void DropboxInfoRequest::userResponseCallback(Networking::JsonResponse response)
Networking::CurlJsonRequest *rq = (Networking::CurlJsonRequest *)response.request;
if (rq && rq->getNetworkReadStream())
error.httpResponseCode = rq->getNetworkReadStream()->httpResponseCode();
-
+
if (!json) {
warning("NULL passed instead of JSON");
finishError(error);
diff --git a/backends/cloud/dropbox/dropboxinforequest.h b/backends/cloud/dropbox/dropboxinforequest.h
index a91d016e60..68a3e135de 100644
--- a/backends/cloud/dropbox/dropboxinforequest.h
+++ b/backends/cloud/dropbox/dropboxinforequest.h
@@ -36,7 +36,7 @@ class DropboxInfoRequest: public Networking::Request {
Storage::StorageInfoCallback _infoCallback;
Request *_workingRequest;
bool _ignoreCallback;
-
+
void start();
void userResponseCallback(Networking::JsonResponse response);
void quotaResponseCallback(Networking::JsonResponse response);
diff --git a/backends/cloud/dropbox/dropboxlistdirectoryrequest.cpp b/backends/cloud/dropbox/dropboxlistdirectoryrequest.cpp
index dcbca3131e..cc82f123b1 100644
--- a/backends/cloud/dropbox/dropboxlistdirectoryrequest.cpp
+++ b/backends/cloud/dropbox/dropboxlistdirectoryrequest.cpp
@@ -81,7 +81,7 @@ void DropboxListDirectoryRequest::responseCallback(Networking::JsonResponse resp
Common::JSONValue *json = response.value;
if (json) {
Common::JSONObject responseObjecct = json->asObject();
-
+
if (responseObjecct.contains("error") || responseObjecct.contains("error_summary")) {
warning("Dropbox returned error: %s", responseObjecct.getVal("error_summary")->asString().c_str());
error.failed = true;
@@ -91,7 +91,7 @@ void DropboxListDirectoryRequest::responseCallback(Networking::JsonResponse resp
return;
}
- //TODO: check that ALL keys exist AND HAVE RIGHT TYPE to avoid segfaults
+ //TODO: check that ALL keys exist AND HAVE RIGHT TYPE to avoid segfaults
if (responseObjecct.contains("entries")) {
Common::JSONArray items = responseObjecct.getVal("entries")->asArray();
@@ -110,7 +110,7 @@ void DropboxListDirectoryRequest::responseCallback(Networking::JsonResponse resp
bool hasMore = (responseObjecct.contains("has_more") && responseObjecct.getVal("has_more")->asBool());
- if (hasMore) {
+ if (hasMore) {
Networking::JsonCallback callback = new Common::Callback<DropboxListDirectoryRequest, Networking::JsonResponse>(this, &DropboxListDirectoryRequest::responseCallback);
Networking::ErrorCallback failureCallback = new Common::Callback<DropboxListDirectoryRequest, Networking::ErrorResponse>(this, &DropboxListDirectoryRequest::errorCallback);
Networking::CurlJsonRequest *request = new Networking::CurlJsonRequest(callback, failureCallback, "https://api.dropboxapi.com/2/files/list_folder/continue");
@@ -124,9 +124,9 @@ void DropboxListDirectoryRequest::responseCallback(Networking::JsonResponse resp
request->addPostField(Common::JSON::stringify(&value));
_workingRequest = ConnMan.addRequest(request);
- } else {
+ } else {
finishListing(_files);
- }
+ }
} else {
warning("null, not json");
error.failed = true;
@@ -149,7 +149,7 @@ void DropboxListDirectoryRequest::restart() { start(); }
Common::String DropboxListDirectoryRequest::date() const { return _date; }
-void DropboxListDirectoryRequest::finishListing(Common::Array<StorageFile> &files) {
+void DropboxListDirectoryRequest::finishListing(Common::Array<StorageFile> &files) {
Request::finishSuccess();
if (_listDirectoryCallback) (*_listDirectoryCallback)(Storage::ListDirectoryResponse(this, files));
}
diff --git a/backends/cloud/dropbox/dropboxlistdirectoryrequest.h b/backends/cloud/dropbox/dropboxlistdirectoryrequest.h
index 62dde71f76..5c0d8dfa21 100644
--- a/backends/cloud/dropbox/dropboxlistdirectoryrequest.h
+++ b/backends/cloud/dropbox/dropboxlistdirectoryrequest.h
@@ -41,7 +41,7 @@ class DropboxListDirectoryRequest: public Networking::Request {
Request *_workingRequest;
bool _ignoreCallback;
Common::String _date;
-
+
void start();
void responseCallback(Networking::JsonResponse response);
void errorCallback(Networking::ErrorResponse error);
diff --git a/backends/cloud/dropbox/dropboxstorage.cpp b/backends/cloud/dropbox/dropboxstorage.cpp
index 7e3521f40e..7ef07a5a65 100644
--- a/backends/cloud/dropbox/dropboxstorage.cpp
+++ b/backends/cloud/dropbox/dropboxstorage.cpp
@@ -87,7 +87,7 @@ void DropboxStorage::codeFlowComplete(Networking::JsonResponse response) {
CloudMan.removeStorage(this);
} else {
_token = result.getVal("access_token")->asString();
- _uid = result.getVal("uid")->asString();
+ _uid = result.getVal("uid")->asString();
ConfMan.removeKey("dropbox_code", ConfMan.kCloudDomain);
CloudMan.replaceStorage(this, kStorageDropboxId);
ConfMan.flushToDisk();
diff --git a/backends/cloud/dropbox/dropboxstorage.h b/backends/cloud/dropbox/dropboxstorage.h
index 9dd28ba810..0d308f4131 100644
--- a/backends/cloud/dropbox/dropboxstorage.h
+++ b/backends/cloud/dropbox/dropboxstorage.h
@@ -72,9 +72,9 @@ public:
/** Returns ListDirectoryStatus struct with list of files. */
virtual Networking::Request *listDirectory(Common::String path, ListDirectoryCallback callback, Networking::ErrorCallback errorCallback, bool recursive = false);
-
+
/** Returns UploadStatus struct with info about uploaded file. */
- virtual Networking::Request *upload(Common::String path, Common::SeekableReadStream *contents, UploadCallback callback, Networking::ErrorCallback errorCallback);
+ virtual Networking::Request *upload(Common::String path, Common::SeekableReadStream *contents, UploadCallback callback, Networking::ErrorCallback errorCallback);
/** Returns pointer to Networking::NetworkReadStream. */
virtual Networking::Request *streamFileById(Common::String path, Networking::NetworkReadStreamCallback callback, Networking::ErrorCallback errorCallback);
@@ -92,7 +92,7 @@ public:
virtual Common::String savesDirectoryPath();
/**
- * Load token and user id from configs and return DropboxStorage for those.
+ * Load token and user id from configs and return DropboxStorage for those.
* @return pointer to the newly created DropboxStorage or 0 if some problem occured.
*/
static DropboxStorage *loadFromConfig(Common::String keyPrefix);
diff --git a/backends/cloud/dropbox/dropboxuploadrequest.cpp b/backends/cloud/dropbox/dropboxuploadrequest.cpp
index 29b7f60c8a..eaa945ada3 100644
--- a/backends/cloud/dropbox/dropboxuploadrequest.cpp
+++ b/backends/cloud/dropbox/dropboxuploadrequest.cpp
@@ -63,9 +63,9 @@ void DropboxUploadRequest::start() {
uploadNextPart();
}
-void DropboxUploadRequest::uploadNextPart() {
+void DropboxUploadRequest::uploadNextPart() {
const uint32 UPLOAD_PER_ONE_REQUEST = 10 * 1024 * 1024;
-
+
Common::String url = "https://content.dropboxapi.com/2/files/upload_session/";
Common::JSONObject jsonRequestParameters;
@@ -82,8 +82,8 @@ void DropboxUploadRequest::uploadNextPart() {
}
} else {
if ((uint32)(_contentsStream->size() - _contentsStream->pos()) <= UPLOAD_PER_ONE_REQUEST) {
- url += "finish";
- Common::JSONObject jsonCursor, jsonCommit;
+ url += "finish";
+ Common::JSONObject jsonCursor, jsonCommit;
jsonCursor.setVal("session_id", new Common::JSONValue(_sessionId));
jsonCursor.setVal("offset", new Common::JSONValue((long long int)_contentsStream->pos()));
jsonCommit.setVal("path", new Common::JSONValue(_savePath));
@@ -98,22 +98,22 @@ void DropboxUploadRequest::uploadNextPart() {
jsonCursor.setVal("session_id", new Common::JSONValue(_sessionId));
jsonCursor.setVal("offset", new Common::JSONValue((long long int)_contentsStream->pos()));
jsonRequestParameters.setVal("cursor", new Common::JSONValue(jsonCursor));
- jsonRequestParameters.setVal("close", new Common::JSONValue(false));
+ jsonRequestParameters.setVal("close", new Common::JSONValue(false));
}
}
-
+
Common::JSONValue value(jsonRequestParameters);
Networking::JsonCallback callback = new Common::Callback<DropboxUploadRequest, Networking::JsonResponse>(this, &DropboxUploadRequest::partUploadedCallback);
Networking::ErrorCallback failureCallback = new Common::Callback<DropboxUploadRequest, Networking::ErrorResponse>(this, &DropboxUploadRequest::partUploadedErrorCallback);
Networking::CurlJsonRequest *request = new Networking::CurlJsonRequest(callback, failureCallback, url);
request->addHeader("Authorization: Bearer " + _token);
- request->addHeader("Content-Type: application/octet-stream");
- request->addHeader("Dropbox-API-Arg: " + Common::JSON::stringify(&value));
+ request->addHeader("Content-Type: application/octet-stream");
+ request->addHeader("Dropbox-API-Arg: " + Common::JSON::stringify(&value));
byte *buffer = new byte[UPLOAD_PER_ONE_REQUEST];
uint32 size = _contentsStream->read(buffer, UPLOAD_PER_ONE_REQUEST);
request->setBuffer(buffer, size);
-
+
_workingRequest = ConnMan.addRequest(request);
}
@@ -137,7 +137,7 @@ void DropboxUploadRequest::partUploadedCallback(Networking::JsonResponse respons
//debug("%s", json->stringify(true).c_str());
if (object.contains("error") || object.contains("error_summary")) {
- warning("Dropbox returned error: %s", object.getVal("error_summary")->asString().c_str());
+ warning("Dropbox returned error: %s", object.getVal("error_summary")->asString().c_str());
error.response = json->stringify(true);
finishError(error);
delete json;
@@ -162,14 +162,14 @@ void DropboxUploadRequest::partUploadedCallback(Networking::JsonResponse respons
}
}
- if (!needsFinishRequest && (_contentsStream->eos() || _contentsStream->pos() >= _contentsStream->size() - 1)) {
+ if (!needsFinishRequest && (_contentsStream->eos() || _contentsStream->pos() >= _contentsStream->size() - 1)) {
warning("no file info to return");
finishUpload(StorageFile(_savePath, 0, 0, false));
} else {
uploadNextPart();
}
} else {
- warning("null, not json");
+ warning("null, not json");
finishError(error);
}
diff --git a/backends/cloud/dropbox/dropboxuploadrequest.h b/backends/cloud/dropbox/dropboxuploadrequest.h
index 8d9a3e2650..5adf5a6df2 100644
--- a/backends/cloud/dropbox/dropboxuploadrequest.h
+++ b/backends/cloud/dropbox/dropboxuploadrequest.h
@@ -39,7 +39,7 @@ class DropboxUploadRequest: public Networking::Request {
Request *_workingRequest;
bool _ignoreCallback;
Common::String _sessionId;
-
+
void start();
void uploadNextPart();
void partUploadedCallback(Networking::JsonResponse response);
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-14 03:21:09 +0000