diff options
author | Alexander Tkachev | 2016-07-21 11:44:36 +0600 |
---|---|---|
committer | Alexander Tkachev | 2016-08-24 16:07:55 +0600 |
commit | 438ba985a4a97a8695a6e6fdda6930694976c07b (patch) | |
tree | 066e589b809278ff2e06df31069f8ea3fb6989d7 /backends/cloud/googledrive | |
parent | 01161ae7ddbc5f147dd9e71991eb2f1a1c9a7b06 (diff) | |
download | scummvm-rg350-438ba985a4a97a8695a6e6fdda6930694976c07b.tar.gz scummvm-rg350-438ba985a4a97a8695a6e6fdda6930694976c07b.tar.bz2 scummvm-rg350-438ba985a4a97a8695a6e6fdda6930694976c07b.zip |
JANITORIAL: Remove spaces at the end of the line
I knew there were some, but I wanted to fix them once, instead of doing
it all the time.
Diffstat (limited to 'backends/cloud/googledrive')
8 files changed, 41 insertions, 41 deletions
diff --git a/backends/cloud/googledrive/googledrivelistdirectorybyidrequest.cpp b/backends/cloud/googledrive/googledrivelistdirectorybyidrequest.cpp index 36bc390da0..7b05d48784 100644 --- a/backends/cloud/googledrive/googledrivelistdirectorybyidrequest.cpp +++ b/backends/cloud/googledrive/googledrivelistdirectorybyidrequest.cpp @@ -82,7 +82,7 @@ void GoogleDriveListDirectoryByIdRequest::responseCallback(Networking::JsonRespo Common::JSONObject responseObject = json->asObject(); ///debug("%s", json->stringify(true).c_str()); - + if (responseObject.contains("error") || responseObject.contains("error_summary")) { warning("GoogleDrive returned error: %s", responseObject.getVal("error_summary")->asString().c_str()); error.failed = true; @@ -92,7 +92,7 @@ void GoogleDriveListDirectoryByIdRequest::responseCallback(Networking::JsonRespo 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 (responseObject.contains("files") && responseObject.getVal("files")->isArray()) { Common::JSONArray items = responseObject.getVal("files")->asArray(); @@ -117,9 +117,9 @@ void GoogleDriveListDirectoryByIdRequest::responseCallback(Networking::JsonRespo if (hasMore) { Common::String token = responseObject.getVal("nextPageToken")->asString(); makeRequest(token); - } else { + } else { finishListing(_files); - } + } } else { warning("null, not json"); error.failed = true; @@ -142,7 +142,7 @@ void GoogleDriveListDirectoryByIdRequest::restart() { start(); } Common::String GoogleDriveListDirectoryByIdRequest::date() const { return _date; } -void GoogleDriveListDirectoryByIdRequest::finishListing(Common::Array<StorageFile> &files) { +void GoogleDriveListDirectoryByIdRequest::finishListing(Common::Array<StorageFile> &files) { Request::finishSuccess(); if (_listDirectoryCallback) (*_listDirectoryCallback)(Storage::ListDirectoryResponse(this, files)); } diff --git a/backends/cloud/googledrive/googledrivelistdirectorybyidrequest.h b/backends/cloud/googledrive/googledrivelistdirectorybyidrequest.h index ecde880323..e94c6b1f4e 100644 --- a/backends/cloud/googledrive/googledrivelistdirectorybyidrequest.h +++ b/backends/cloud/googledrive/googledrivelistdirectorybyidrequest.h @@ -34,7 +34,7 @@ namespace GoogleDrive { class GoogleDriveStorage; class GoogleDriveListDirectoryByIdRequest: public Networking::Request { - Common::String _requestedId; + Common::String _requestedId; GoogleDriveStorage *_storage; Storage::ListDirectoryCallback _listDirectoryCallback; @@ -42,7 +42,7 @@ class GoogleDriveListDirectoryByIdRequest: public Networking::Request { Request *_workingRequest; bool _ignoreCallback; Common::String _date; - + void start(); void makeRequest(Common::String pageToken); void responseCallback(Networking::JsonResponse response); diff --git a/backends/cloud/googledrive/googledrivestorage.cpp b/backends/cloud/googledrive/googledrivestorage.cpp index 77ac8989f1..2d9f33cfce 100644 --- a/backends/cloud/googledrive/googledrivestorage.cpp +++ b/backends/cloud/googledrive/googledrivestorage.cpp @@ -138,7 +138,7 @@ void GoogleDriveStorage::codeFlowFailed(Networking::ErrorResponse error) { CloudMan.removeStorage(this); } -void GoogleDriveStorage::saveConfig(Common::String keyPrefix) { +void GoogleDriveStorage::saveConfig(Common::String keyPrefix) { ConfMan.set(keyPrefix + "access_token", _token, ConfMan.kCloudDomain); ConfMan.set(keyPrefix + "refresh_token", _refreshToken, ConfMan.kCloudDomain); } @@ -173,11 +173,11 @@ void GoogleDriveStorage::infoInnerCallback(StorageInfoCallback outerCallback, Ne //"usageInDrive":"6332462","limit":"18253611008","usage":"6332462","usageInDriveTrash":"0" Common::JSONObject storageQuota = info.getVal("storageQuota")->asObject(); Common::String usage = storageQuota.getVal("usage")->asString(); - Common::String limit = storageQuota.getVal("limit")->asString(); + Common::String limit = storageQuota.getVal("limit")->asString(); quotaUsed = usage.asUint64(); quotaAllocated = limit.asUint64(); } - + CloudMan.setStorageUsername(kStorageGoogleDriveId, email); if (outerCallback) { @@ -197,7 +197,7 @@ void GoogleDriveStorage::createDirectoryInnerCallback(BoolCallback outerCallback } if (outerCallback) { - Common::JSONObject info = json->asObject(); + Common::JSONObject info = json->asObject(); (*outerCallback)(BoolResponse(nullptr, info.contains("id"))); delete outerCallback; } @@ -212,7 +212,7 @@ Networking::Request *GoogleDriveStorage::listDirectoryById(Common::String id, Li } Networking::Request *GoogleDriveStorage::upload(Common::String path, Common::SeekableReadStream *contents, UploadCallback callback, Networking::ErrorCallback errorCallback) { - return addRequest(new GoogleDriveUploadRequest(this, path, contents, callback, errorCallback)); + return addRequest(new GoogleDriveUploadRequest(this, path, contents, callback, errorCallback)); } Networking::Request *GoogleDriveStorage::streamFileById(Common::String id, Networking::NetworkReadStreamCallback callback, Networking::ErrorCallback errorCallback) { @@ -221,7 +221,7 @@ Networking::Request *GoogleDriveStorage::streamFileById(Common::String id, Netwo Common::String header = "Authorization: Bearer " + _token; curl_slist *headersList = curl_slist_append(nullptr, header.c_str()); Networking::NetworkReadStream *stream = new Networking::NetworkReadStream(url.c_str(), headersList, ""); - (*callback)(Networking::NetworkReadStreamResponse(nullptr, stream)); + (*callback)(Networking::NetworkReadStreamResponse(nullptr, stream)); } delete callback; delete errorCallback; @@ -237,8 +237,8 @@ void GoogleDriveStorage::printInfo(StorageInfoResponse response) { Networking::Request *GoogleDriveStorage::createDirectoryWithParentId(Common::String parentId, Common::String name, BoolCallback callback, Networking::ErrorCallback errorCallback) { if (!errorCallback) errorCallback = getErrorPrintingCallback(); - - Common::String url = "https://www.googleapis.com/drive/v3/files"; + + Common::String url = "https://www.googleapis.com/drive/v3/files"; Networking::JsonCallback innerCallback = new Common::CallbackBridge<GoogleDriveStorage, BoolResponse, Networking::JsonResponse>(this, &GoogleDriveStorage::createDirectoryInnerCallback, callback); Networking::CurlJsonRequest *request = new GoogleDriveTokenRefresher(this, innerCallback, errorCallback, url.c_str()); request->addHeader("Authorization: Bearer " + accessToken()); @@ -263,7 +263,7 @@ Networking::Request *GoogleDriveStorage::info(StorageInfoCallback callback, Netw Networking::JsonCallback innerCallback = new Common::CallbackBridge<GoogleDriveStorage, StorageInfoResponse, Networking::JsonResponse>(this, &GoogleDriveStorage::infoInnerCallback, callback); Networking::CurlJsonRequest *request = new GoogleDriveTokenRefresher(this, innerCallback, errorCallback, "https://www.googleapis.com/drive/v3/about?fields=storageQuota,user"); request->addHeader("Authorization: Bearer " + _token); - return addRequest(request); + return addRequest(request); } Common::String GoogleDriveStorage::savesDirectoryPath() { return "scummvm/saves/"; } diff --git a/backends/cloud/googledrive/googledrivestorage.h b/backends/cloud/googledrive/googledrivestorage.h index 4c164dd91d..e60719c770 100644 --- a/backends/cloud/googledrive/googledrivestorage.h +++ b/backends/cloud/googledrive/googledrivestorage.h @@ -95,7 +95,7 @@ public: virtual Common::String savesDirectoryPath(); /** - * Load token and user id from configs and return GoogleDriveStorage for those. + * Load token and user id from configs and return GoogleDriveStorage for those. * @return pointer to the newly created GoogleDriveStorage or 0 if some problem occured. */ static GoogleDriveStorage *loadFromConfig(Common::String keyPrefix); diff --git a/backends/cloud/googledrive/googledrivetokenrefresher.cpp b/backends/cloud/googledrive/googledrivetokenrefresher.cpp index 9e26e62149..b876bc2995 100644 --- a/backends/cloud/googledrive/googledrivetokenrefresher.cpp +++ b/backends/cloud/googledrive/googledrivetokenrefresher.cpp @@ -52,7 +52,7 @@ void GoogleDriveTokenRefresher::tokenRefreshed(Storage::BoolResponse response) { } setHeaders(_headers); - //successfully received refreshed token, can restart the original request now + //successfully received refreshed token, can restart the original request now retry(0); } @@ -65,13 +65,13 @@ void GoogleDriveTokenRefresher::finishJson(Common::JSONValue *json) { Common::JSONObject result = json->asObject(); if (result.contains("error")) { - //new token needed => request token & then retry original request + //new token needed => request token & then retry original request if (_stream) { debug(9, "code %ld", _stream->httpResponseCode()); } Common::JSONObject error = result.getVal("error")->asObject(); - bool irrecoverable = true; + bool irrecoverable = true; uint32 code = -1; Common::String message; @@ -88,13 +88,13 @@ void GoogleDriveTokenRefresher::finishJson(Common::JSONValue *json) { if (code == 401 || message == "Invalid Credentials") irrecoverable = false; - if (irrecoverable) { + if (irrecoverable) { finishError(Networking::ErrorResponse(this, false, true, json->stringify(true), -1)); //TODO: httpCode delete json; return; } - pause(); + pause(); delete json; _parentStorage->getAccessToken(new Common::Callback<GoogleDriveTokenRefresher, Storage::BoolResponse>(this, &GoogleDriveTokenRefresher::tokenRefreshed)); return; @@ -104,7 +104,7 @@ void GoogleDriveTokenRefresher::finishJson(Common::JSONValue *json) { CurlJsonRequest::finishJson(json); } -void GoogleDriveTokenRefresher::setHeaders(Common::Array<Common::String> &headers) { +void GoogleDriveTokenRefresher::setHeaders(Common::Array<Common::String> &headers) { _headers = headers; curl_slist_free_all(_headersList); _headersList = 0; diff --git a/backends/cloud/googledrive/googledrivetokenrefresher.h b/backends/cloud/googledrive/googledrivetokenrefresher.h index 3bc5fbd784..6cb3e41849 100644 --- a/backends/cloud/googledrive/googledrivetokenrefresher.h +++ b/backends/cloud/googledrive/googledrivetokenrefresher.h @@ -33,12 +33,12 @@ class GoogleDriveStorage; class GoogleDriveTokenRefresher: public Networking::CurlJsonRequest { GoogleDriveStorage *_parentStorage; - Common::Array<Common::String> _headers; - + Common::Array<Common::String> _headers; + void tokenRefreshed(Storage::BoolResponse response); virtual void finishJson(Common::JSONValue *json); -public: +public: GoogleDriveTokenRefresher(GoogleDriveStorage *parent, Networking::JsonCallback callback, Networking::ErrorCallback ecb, const char *url); virtual ~GoogleDriveTokenRefresher(); diff --git a/backends/cloud/googledrive/googledriveuploadrequest.cpp b/backends/cloud/googledrive/googledriveuploadrequest.cpp index b63e989df8..4a7c30e9a5 100644 --- a/backends/cloud/googledrive/googledriveuploadrequest.cpp +++ b/backends/cloud/googledrive/googledriveuploadrequest.cpp @@ -164,7 +164,7 @@ void GoogleDriveUploadRequest::startUploadCallback(Networking::JsonResponse resp } } - Common::JSONValue *json = response.value; + Common::JSONValue *json = response.value; delete json; finishError(error); @@ -179,11 +179,11 @@ void GoogleDriveUploadRequest::startUploadErrorCallback(Networking::ErrorRespons void GoogleDriveUploadRequest::uploadNextPart() { const uint32 UPLOAD_PER_ONE_REQUEST = 10 * 1024 * 1024; Common::String url = _uploadUrl; - + Networking::JsonCallback callback = new Common::Callback<GoogleDriveUploadRequest, Networking::JsonResponse>(this, &GoogleDriveUploadRequest::partUploadedCallback); Networking::ErrorCallback failureCallback = new Common::Callback<GoogleDriveUploadRequest, Networking::ErrorResponse>(this, &GoogleDriveUploadRequest::partUploadedErrorCallback); Networking::CurlJsonRequest *request = new GoogleDriveTokenRefresher(_storage, callback, failureCallback, url.c_str()); - request->addHeader("Authorization: Bearer " + _storage->accessToken()); + request->addHeader("Authorization: Bearer " + _storage->accessToken()); request->usePut(); uint32 oldPos = _contentsStream->pos(); @@ -206,17 +206,17 @@ void GoogleDriveUploadRequest::uploadNextPart() { else request->addHeader(Common::String::format("Content-Range: bytes %u-%u/%u", oldPos, _contentsStream->pos() - 1, _contentsStream->size())); } - + _workingRequest = ConnMan.addRequest(request); } bool GoogleDriveUploadRequest::handleHttp308(const Networking::NetworkReadStream *stream) { //308 Resume Incomplete, with Range: X-Y header if (!stream) return false; - if (stream->httpResponseCode() != 308) return false; //seriously - + if (stream->httpResponseCode() != 308) return false; //seriously + Common::String headers = stream->responseHeaders(); - const char *cstr = headers.c_str(); + const char *cstr = headers.c_str(); for (int rangeTry = 0; rangeTry < 2; ++rangeTry) { const char *needle = (rangeTry==0 ? "Range: 0-" : "Range: bytes=0-"); uint32 needleLength = (rangeTry == 0 ? 9 : 15); @@ -239,12 +239,12 @@ bool GoogleDriveUploadRequest::handleHttp308(const Networking::NetworkReadStream return false; } -void GoogleDriveUploadRequest::partUploadedCallback(Networking::JsonResponse response) { +void GoogleDriveUploadRequest::partUploadedCallback(Networking::JsonResponse response) { _workingRequest = nullptr; if (_ignoreCallback) return; - + Networking::ErrorResponse error(this, false, true, "", -1); - Networking::CurlJsonRequest *rq = (Networking::CurlJsonRequest *)response.request; + Networking::CurlJsonRequest *rq = (Networking::CurlJsonRequest *)response.request; if (rq) { const Networking::NetworkReadStream *stream = rq->getNetworkReadStream(); if (stream) { @@ -301,16 +301,16 @@ void GoogleDriveUploadRequest::partUploadedCallback(Networking::JsonResponse res delete json; } -void GoogleDriveUploadRequest::partUploadedErrorCallback(Networking::ErrorResponse error) { +void GoogleDriveUploadRequest::partUploadedErrorCallback(Networking::ErrorResponse error) { _workingRequest = nullptr; if (_ignoreCallback) return; - + Networking::CurlJsonRequest *rq = (Networking::CurlJsonRequest *)error.request; if (rq) { const Networking::NetworkReadStream *stream = rq->getNetworkReadStream(); if (stream) { - long code = stream->httpResponseCode(); - if (code == 308 && handleHttp308(stream)) { + long code = stream->httpResponseCode(); + if (code == 308 && handleHttp308(stream)) { return; } } diff --git a/backends/cloud/googledrive/googledriveuploadrequest.h b/backends/cloud/googledrive/googledriveuploadrequest.h index 8cc40795e9..73acab5bbd 100644 --- a/backends/cloud/googledrive/googledriveuploadrequest.h +++ b/backends/cloud/googledrive/googledriveuploadrequest.h @@ -42,7 +42,7 @@ class GoogleDriveUploadRequest: public Networking::Request { Common::String _resolvedId, _parentId; Common::String _uploadUrl; uint64 _serverReceivedBytes; - + void start(); void resolveId(); void idResolvedCallback(Storage::UploadResponse response); |