aboutsummaryrefslogtreecommitdiff
path: root/backends/cloud/onedrive/onedriveuploadrequest.cpp
diff options
context:
space:
mode:
authorAlexander Tkachev2016-07-22 20:54:02 +0600
committerAlexander Tkachev2016-08-24 16:07:55 +0600
commitd57e0c89b5b20dac247cb2f43450014d84719ba6 (patch)
treebd4378856a83d3fe914cf734b87b2dbbbe75c838 /backends/cloud/onedrive/onedriveuploadrequest.cpp
parentf3959e140106334b33cf74832fc5b20d27407d0a (diff)
downloadscummvm-rg350-d57e0c89b5b20dac247cb2f43450014d84719ba6.tar.gz
scummvm-rg350-d57e0c89b5b20dac247cb2f43450014d84719ba6.tar.bz2
scummvm-rg350-d57e0c89b5b20dac247cb2f43450014d84719ba6.zip
CLOUD: #define all OAuth2/API-related URLs
Diffstat (limited to 'backends/cloud/onedrive/onedriveuploadrequest.cpp')
-rw-r--r--backends/cloud/onedrive/onedriveuploadrequest.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/backends/cloud/onedrive/onedriveuploadrequest.cpp b/backends/cloud/onedrive/onedriveuploadrequest.cpp
index 331800a381..ef1507d1f2 100644
--- a/backends/cloud/onedrive/onedriveuploadrequest.cpp
+++ b/backends/cloud/onedrive/onedriveuploadrequest.cpp
@@ -33,6 +33,9 @@
namespace Cloud {
namespace OneDrive {
+#define ONEDRIVE_API_SPECIAL_APPROOT_UPLOAD "https://api.onedrive.com/v1.0/drive/special/approot:/%s:/upload.createSession"
+#define ONEDRIVE_API_SPECIAL_APPROOT_CONTENT "https://api.onedrive.com/v1.0/drive/special/approot:/%s:/content"
+
OneDriveUploadRequest::OneDriveUploadRequest(OneDriveStorage *storage, Common::String path, Common::SeekableReadStream *contents, Storage::UploadCallback callback, Networking::ErrorCallback ecb):
Networking::Request(nullptr, ecb), _storage(storage), _savePath(path), _contentsStream(contents), _uploadCallback(callback),
_workingRequest(nullptr), _ignoreCallback(false) {
@@ -70,7 +73,7 @@ void OneDriveUploadRequest::uploadNextPart() {
const uint32 UPLOAD_PER_ONE_REQUEST = 10 * 1024 * 1024;
if (_uploadUrl == "" && (uint32)_contentsStream->size() > UPLOAD_PER_ONE_REQUEST) {
- Common::String url = "https://api.onedrive.com/v1.0/drive/special/approot:/" + ConnMan.urlEncode(_savePath) + ":/upload.createSession"; //folder must exist
+ Common::String url = Common::String::format(ONEDRIVE_API_SPECIAL_APPROOT_UPLOAD, ConnMan.urlEncode(_savePath).c_str()); //folder must exist
Networking::JsonCallback callback = new Common::Callback<OneDriveUploadRequest, Networking::JsonResponse>(this, &OneDriveUploadRequest::partUploadedCallback);
Networking::ErrorCallback failureCallback = new Common::Callback<OneDriveUploadRequest, Networking::ErrorResponse>(this, &OneDriveUploadRequest::partUploadedErrorCallback);
Networking::CurlJsonRequest *request = new OneDriveTokenRefresher(_storage, callback, failureCallback, url.c_str());
@@ -82,7 +85,7 @@ void OneDriveUploadRequest::uploadNextPart() {
Common::String url;
if (_uploadUrl == "") {
- url = "https://api.onedrive.com/v1.0/drive/special/approot:/" + ConnMan.urlEncode(_savePath) + ":/content";
+ url = Common::String::format(ONEDRIVE_API_SPECIAL_APPROOT_CONTENT, ConnMan.urlEncode(_savePath).c_str());
} else {
url = _uploadUrl;
}