libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-11-26 19:00:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

BACKENDS: Avoid passing arguments by value in cloud and networking

Browse Source 
Use references everywhere it's possible.
Use override keyword to raise errors when there are discrepancies.
This commit is contained in:
Le Philousophe 2023-09-20 08:20:04 +02:00 committed by Eugene Sandulenko
parent 6a7985cc71
commit 0043d344a9
129 changed files with 957 additions and 956 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
backends/cloud/basestorage.cpp
View File

@ -31,16 +31,16 @@ namespace Cloud {
BaseStorage::BaseStorage() {}
BaseStorage::BaseStorage(Common::String token, Common::String refreshToken, bool enabled):
BaseStorage::BaseStorage(const Common::String &token, const Common::String &refreshToken, bool enabled):
_token(token), _refreshToken(refreshToken) {
_isEnabled = enabled;
}
BaseStorage::~BaseStorage() {}
void BaseStorage::getAccessToken(Common::String code, Networking::ErrorCallback callback) {
Networking::JsonCallback innerCallback = new Common::CallbackBridge<BaseStorage, Networking::ErrorResponse, Networking::JsonResponse>(this, &BaseStorage::codeFlowComplete, callback);
Networking::ErrorCallback errorCallback = new Common::CallbackBridge<BaseStorage, Networking::ErrorResponse, Networking::ErrorResponse>(this, &BaseStorage::codeFlowFailed, callback);
void BaseStorage::getAccessToken(const Common::String &code, Networking::ErrorCallback callback) {
Networking::JsonCallback innerCallback = new Common::CallbackBridge<BaseStorage, const Networking::ErrorResponse &, const Networking::JsonResponse &>(this, &BaseStorage::codeFlowComplete, callback);
Networking::ErrorCallback errorCallback = new Common::CallbackBridge<BaseStorage, const Networking::ErrorResponse &, const Networking::ErrorResponse &>(this, &BaseStorage::codeFlowFailed, callback);
Common::String url = Common::String::format("https://cloud.scummvm.org/%s/token/%s", cloudProvider().c_str(), code.c_str());
Networking::CurlJsonRequest *request = new Networking::CurlJsonRequest(innerCallback, errorCallback, url);
@ -48,11 +48,11 @@ void BaseStorage::getAccessToken(Common::String code, Networking::ErrorCallback
addRequest(request);
}
void BaseStorage::codeFlowComplete(Networking::ErrorCallback callback, Networking::JsonResponse response) {
void BaseStorage::codeFlowComplete(Networking::ErrorCallback callback, const Networking::JsonResponse &response) {
bool success = true;
Common::String callbackMessage = "OK";
Common::JSONValue *json = (Common::JSONValue *)response.value;
const Common::JSONValue *json = response.value;
if (json == nullptr) {
debug(9, "BaseStorage::codeFlowComplete: got NULL instead of JSON!");
success = false;
@ -123,7 +123,7 @@ void BaseStorage::codeFlowComplete(Networking::ErrorCallback callback, Networkin
delete callback;
}
void BaseStorage::codeFlowFailed(Networking::ErrorCallback callback, Networking::ErrorResponse error) {
void BaseStorage::codeFlowFailed(Networking::ErrorCallback callback, const Networking::ErrorResponse &error) {
debug(9, "BaseStorage: code flow failed (%s, %ld):", (error.failed ? "failed" : "interrupted"), error.httpResponseCode);
debug(9, "%s", error.response.c_str());
CloudMan.removeStorage(this);
@ -140,7 +140,7 @@ void BaseStorage::refreshAccessToken(BoolCallback callback, Networking::ErrorCal
return;
}
Networking::JsonCallback innerCallback = new Common::CallbackBridge<BaseStorage, BoolResponse, Networking::JsonResponse>(this, &BaseStorage::tokenRefreshed, callback);
Networking::JsonCallback innerCallback = new Common::CallbackBridge<BaseStorage, const BoolResponse &, const Networking::JsonResponse &>(this, &BaseStorage::tokenRefreshed, callback);
if (errorCallback == nullptr)
errorCallback = getErrorPrintingCallback();
@ -150,10 +150,10 @@ void BaseStorage::refreshAccessToken(BoolCallback callback, Networking::ErrorCal
addRequest(request);
}
void BaseStorage::tokenRefreshed(BoolCallback callback, Networking::JsonResponse response) {
void BaseStorage::tokenRefreshed(BoolCallback callback, const Networking::JsonResponse &response) {
bool success = true;
Common::JSONValue *json = response.value;
const Common::JSONValue *json = response.value;
if (json == nullptr) {
debug(9, "BaseStorage::tokenRefreshed: got NULL instead of JSON!");
success = false;

12
backends/cloud/basestorage.h
View File

@ -36,19 +36,19 @@ protected:
* Gets token from cloud.scummvm.org using given code.
* Base implementation for storages with common auth procedure.
*/
virtual void getAccessToken(Common::String code, Networking::ErrorCallback callback);
virtual void getAccessToken(const Common::String &code, Networking::ErrorCallback callback);
/**
* Handles JSON response which should contain access token requested
* with getAccessToken().
*/
virtual void codeFlowComplete(Networking::ErrorCallback callback, Networking::JsonResponse response);
virtual void codeFlowComplete(Networking::ErrorCallback callback, const Networking::JsonResponse &response);
/**
* Handles network errors occurred while getting access token requested
* with getAccessToken().
*/
virtual void codeFlowFailed(Networking::ErrorCallback callback, Networking::ErrorResponse error);
virtual void codeFlowFailed(Networking::ErrorCallback callback, const Networking::ErrorResponse &error);
/**
* Return cloud provider name, used in cloud.scummvm.org endpoints.
@ -74,7 +74,7 @@ protected:
virtual bool canReuseRefreshToken() = 0;
private:
void tokenRefreshed(BoolCallback callback, Networking::JsonResponse response);
void tokenRefreshed(BoolCallback callback, const Networking::JsonResponse &response);
protected:
/** Helper function to save Storage::_isEnabled into config. */
@ -88,8 +88,8 @@ protected:
public:
BaseStorage();
BaseStorage(Common::String token, Common::String refreshToken, bool enabled = false);
virtual ~BaseStorage();
BaseStorage(const Common::String &token, const Common::String &refreshToken, bool enabled = false);
~BaseStorage() override;
/**
* Gets new access_token. Pass a callback, so you could

14
backends/cloud/box/boxlistdirectorybyidrequest.cpp
View File

@ -35,7 +35,7 @@ namespace Box {
#define BOX_LIST_DIRECTORY_LIMIT 1000
#define BOX_FOLDERS_API_LINK "https://api.box.com/2.0/folders/%s/items?offset=%u&limit=%u&fields=%s"
BoxListDirectoryByIdRequest::BoxListDirectoryByIdRequest(BoxStorage *storage, Common::String id, Storage::ListDirectoryCallback cb, Networking::ErrorCallback ecb):
BoxListDirectoryByIdRequest::BoxListDirectoryByIdRequest(BoxStorage *storage, const Common::String &id, Storage::ListDirectoryCallback cb, Networking::ErrorCallback ecb):
Networking::Request(nullptr, ecb), _requestedId(id), _storage(storage), _listDirectoryCallback(cb),
_workingRequest(nullptr), _ignoreCallback(false) {
start();
@ -65,14 +65,14 @@ void BoxListDirectoryByIdRequest::makeRequest(uint32 offset) {
"id,type,name,size,modified_at"
);
Networking::JsonCallback callback = new Common::Callback<BoxListDirectoryByIdRequest, Networking::JsonResponse>(this, &BoxListDirectoryByIdRequest::responseCallback);
Networking::ErrorCallback failureCallback = new Common::Callback<BoxListDirectoryByIdRequest, Networking::ErrorResponse>(this, &BoxListDirectoryByIdRequest::errorCallback);
Networking::JsonCallback callback = new Common::Callback<BoxListDirectoryByIdRequest, const Networking::JsonResponse &>(this, &BoxListDirectoryByIdRequest::responseCallback);
Networking::ErrorCallback failureCallback = new Common::Callback<BoxListDirectoryByIdRequest, const Networking::ErrorResponse &>(this, &BoxListDirectoryByIdRequest::errorCallback);
Networking::CurlJsonRequest *request = new BoxTokenRefresher(_storage, callback, failureCallback, url.c_str());
request->addHeader("Authorization: Bearer " + _storage->accessToken());
_workingRequest = ConnMan.addRequest(request);
}
void BoxListDirectoryByIdRequest::responseCallback(Networking::JsonResponse response) {
void BoxListDirectoryByIdRequest::responseCallback(const Networking::JsonResponse &response) {
_workingRequest = nullptr;
if (_ignoreCallback) {
delete response.value;
@ -83,11 +83,11 @@ void BoxListDirectoryByIdRequest::responseCallback(Networking::JsonResponse resp
_date = response.request->date();
Networking::ErrorResponse error(this, "BoxListDirectoryByIdRequest::responseCallback: unknown error");
Networking::CurlJsonRequest *rq = (Networking::CurlJsonRequest *)response.request;
const Networking::CurlJsonRequest *rq = (const Networking::CurlJsonRequest *)response.request;
if (rq && rq->getNetworkReadStream())
error.httpResponseCode = rq->getNetworkReadStream()->httpResponseCode();
Common::JSONValue *json = response.value;
const Common::JSONValue *json = response.value;
if (json == nullptr) {
error.response = "Failed to parse JSON, null passed!";
finishError(error);
@ -172,7 +172,7 @@ void BoxListDirectoryByIdRequest::responseCallback(Networking::JsonResponse resp
delete json;
}
void BoxListDirectoryByIdRequest::errorCallback(Networking::ErrorResponse error) {
void BoxListDirectoryByIdRequest::errorCallback(const Networking::ErrorResponse &error) {
_workingRequest = nullptr;
if (_ignoreCallback) return;
if (error.request) _date = error.request->date();

14
backends/cloud/box/boxlistdirectorybyidrequest.h
View File

@ -44,16 +44,16 @@ class BoxListDirectoryByIdRequest: public Networking::Request {
void start();
void makeRequest(uint32 offset);
void responseCallback(Networking::JsonResponse response);
void errorCallback(Networking::ErrorResponse error);
void responseCallback(const Networking::JsonResponse &response);
void errorCallback(const Networking::ErrorResponse &error);
void finishListing(Common::Array<StorageFile> &files);
public:
BoxListDirectoryByIdRequest(BoxStorage *storage, Common::String id, Storage::ListDirectoryCallback cb, Networking::ErrorCallback ecb);
virtual ~BoxListDirectoryByIdRequest();
BoxListDirectoryByIdRequest(BoxStorage *storage, const Common::String &id, Storage::ListDirectoryCallback cb, Networking::ErrorCallback ecb);
~BoxListDirectoryByIdRequest() override;
virtual void handle();
virtual void restart();
virtual Common::String date() const;
void handle() override;
void restart() override;
Common::String date() const override;
};
} // End of namespace Box

34
backends/cloud/box/boxstorage.cpp
View File

@ -41,14 +41,14 @@ namespace Box {
#define BOX_API_FILES_CONTENT "https://api.box.com/2.0/files/%s/content"
#define BOX_API_USERS_ME "https://api.box.com/2.0/users/me"
BoxStorage::BoxStorage(Common::String token, Common::String refreshToken, bool enabled):
BoxStorage::BoxStorage(const Common::String &token, const Common::String &refreshToken, bool enabled):
IdStorage(token, refreshToken, enabled) {}
BoxStorage::BoxStorage(Common::String code, Networking::ErrorCallback cb) {
BoxStorage::BoxStorage(const Common::String &code, Networking::ErrorCallback cb) {
getAccessToken(code, cb);
}
BoxStorage::BoxStorage(Networking::JsonResponse codeFlowJson, Networking::ErrorCallback cb) {
BoxStorage::BoxStorage(const Networking::JsonResponse &codeFlowJson, Networking::ErrorCallback cb) {
codeFlowComplete(cb, codeFlowJson);
}
@ -62,7 +62,7 @@ bool BoxStorage::needsRefreshToken() { return true; }
bool BoxStorage::canReuseRefreshToken() { return false; }
void BoxStorage::saveConfig(Common::String keyPrefix) {
void BoxStorage::saveConfig(const Common::String &keyPrefix) {
ConfMan.set(keyPrefix + "access_token", _token, ConfMan.kCloudDomain);
ConfMan.set(keyPrefix + "refresh_token", _refreshToken, ConfMan.kCloudDomain);
saveIsEnabledFlag(keyPrefix);
@ -72,8 +72,8 @@ Common::String BoxStorage::name() const {
return "Box";
}
void BoxStorage::infoInnerCallback(StorageInfoCallback outerCallback, Networking::JsonResponse response) {
Common::JSONValue *json = response.value;
void BoxStorage::infoInnerCallback(StorageInfoCallback outerCallback, const Networking::JsonResponse &response) {
const Common::JSONValue *json = response.value;
if (!json) {
warning("BoxStorage::infoInnerCallback: NULL passed instead of JSON");
delete outerCallback;
@ -122,7 +122,7 @@ void BoxStorage::infoInnerCallback(StorageInfoCallback outerCallback, Networking
delete json;
}
Networking::Request *BoxStorage::listDirectoryById(Common::String id, ListDirectoryCallback callback, Networking::ErrorCallback errorCallback) {
Networking::Request *BoxStorage::listDirectoryById(const Common::String &id, ListDirectoryCallback callback, Networking::ErrorCallback errorCallback) {
if (!errorCallback)
errorCallback = getErrorPrintingCallback();
if (!callback)
@ -130,8 +130,8 @@ Networking::Request *BoxStorage::listDirectoryById(Common::String id, ListDirect
return addRequest(new BoxListDirectoryByIdRequest(this, id, callback, errorCallback));
}
void BoxStorage::createDirectoryInnerCallback(BoolCallback outerCallback, Networking::JsonResponse response) {
Common::JSONValue *json = response.value;
void BoxStorage::createDirectoryInnerCallback(BoolCallback outerCallback, const Networking::JsonResponse &response) {
const Common::JSONValue *json = response.value;
if (!json) {
warning("BoxStorage::createDirectoryInnerCallback: NULL passed instead of JSON");
delete outerCallback;
@ -151,12 +151,12 @@ void BoxStorage::createDirectoryInnerCallback(BoolCallback outerCallback, Networ
delete json;
}
Networking::Request *BoxStorage::createDirectoryWithParentId(Common::String parentId, Common::String directoryName, BoolCallback callback, Networking::ErrorCallback errorCallback) {
Networking::Request *BoxStorage::createDirectoryWithParentId(const Common::String &parentId, const Common::String &directoryName, BoolCallback callback, Networking::ErrorCallback errorCallback) {
if (!errorCallback)
errorCallback = getErrorPrintingCallback();
Common::String url = BOX_API_FOLDERS;
Networking::JsonCallback innerCallback = new Common::CallbackBridge<BoxStorage, BoolResponse, Networking::JsonResponse>(this, &BoxStorage::createDirectoryInnerCallback, callback);
Networking::JsonCallback innerCallback = new Common::CallbackBridge<BoxStorage, const BoolResponse &, const Networking::JsonResponse &>(this, &BoxStorage::createDirectoryInnerCallback, callback);
Networking::CurlJsonRequest *request = new BoxTokenRefresher(this, innerCallback, errorCallback, url.c_str());
request->addHeader("Authorization: Bearer " + accessToken());
request->addHeader("Content-Type: application/json");
@ -174,13 +174,13 @@ Networking::Request *BoxStorage::createDirectoryWithParentId(Common::String pare
return addRequest(request);
}
Networking::Request *BoxStorage::upload(Common::String remotePath, Common::String localPath, UploadCallback callback, Networking::ErrorCallback errorCallback) {
Networking::Request *BoxStorage::upload(const Common::String &remotePath, const Common::String &localPath, UploadCallback callback, Networking::ErrorCallback errorCallback) {
if (!errorCallback)
errorCallback = getErrorPrintingCallback();
return addRequest(new BoxUploadRequest(this, remotePath, localPath, callback, errorCallback));
}
Networking::Request *BoxStorage::upload(Common::String path, Common::SeekableReadStream *contents, UploadCallback callback, Networking::ErrorCallback errorCallback) {
Networking::Request *BoxStorage::upload(const Common::String &path, Common::SeekableReadStream *contents, UploadCallback callback, Networking::ErrorCallback errorCallback) {
warning("BoxStorage::upload(ReadStream) not implemented");
if (errorCallback)
(*errorCallback)(Networking::ErrorResponse(nullptr, false, true, "BoxStorage::upload(ReadStream) not implemented", -1));
@ -193,7 +193,7 @@ bool BoxStorage::uploadStreamSupported() {
return false;
}
Networking::Request *BoxStorage::streamFileById(Common::String id, Networking::NetworkReadStreamCallback callback, Networking::ErrorCallback errorCallback) {
Networking::Request *BoxStorage::streamFileById(const Common::String &id, Networking::NetworkReadStreamCallback callback, Networking::ErrorCallback errorCallback) {
if (callback) {
Common::String url = Common::String::format(BOX_API_FILES_CONTENT, id.c_str());
Common::String header = "Authorization: Bearer " + _token;
@ -207,7 +207,7 @@ Networking::Request *BoxStorage::streamFileById(Common::String id, Networking::N
}
Networking::Request *BoxStorage::info(StorageInfoCallback callback, Networking::ErrorCallback errorCallback) {
Networking::JsonCallback innerCallback = new Common::CallbackBridge<BoxStorage, StorageInfoResponse, Networking::JsonResponse>(this, &BoxStorage::infoInnerCallback, callback);
Networking::JsonCallback innerCallback = new Common::CallbackBridge<BoxStorage, const StorageInfoResponse &, const Networking::JsonResponse &>(this, &BoxStorage::infoInnerCallback, callback);
Networking::CurlJsonRequest *request = new BoxTokenRefresher(this, innerCallback, errorCallback, BOX_API_USERS_ME);
request->addHeader("Authorization: Bearer " + _token);
return addRequest(request);
@ -215,7 +215,7 @@ Networking::Request *BoxStorage::info(StorageInfoCallback callback, Networking::
Common::String BoxStorage::savesDirectoryPath() { return "scummvm/saves/"; }
BoxStorage *BoxStorage::loadFromConfig(Common::String keyPrefix) {
BoxStorage *BoxStorage::loadFromConfig(const Common::String &keyPrefix) {
if (!ConfMan.hasKey(keyPrefix + "access_token", ConfMan.kCloudDomain)) {
warning("BoxStorage: no access_token found");
return nullptr;
@ -231,7 +231,7 @@ BoxStorage *BoxStorage::loadFromConfig(Common::String keyPrefix) {
return new BoxStorage(accessToken, refreshToken, loadIsEnabledFlag(keyPrefix));
}
void BoxStorage::removeFromConfig(Common::String keyPrefix) {
void BoxStorage::removeFromConfig(const Common::String &keyPrefix) {
ConfMan.removeKey(keyPrefix + "access_token", ConfMan.kCloudDomain);
ConfMan.removeKey(keyPrefix + "refresh_token", ConfMan.kCloudDomain);
removeIsEnabledFlag(keyPrefix);

46
backends/cloud/box/boxstorage.h
View File

@ -30,36 +30,36 @@ namespace Box {
class BoxStorage: public Id::IdStorage {
/** This private constructor is called from loadFromConfig(). */
BoxStorage(Common::String token, Common::String refreshToken, bool enabled);
BoxStorage(const Common::String &token, const Common::String &refreshToken, bool enabled);
/** Constructs StorageInfo based on JSON response from cloud. */
void infoInnerCallback(StorageInfoCallback outerCallback, Networking::JsonResponse json);
void infoInnerCallback(StorageInfoCallback outerCallback, const Networking::JsonResponse &json);
void createDirectoryInnerCallback(BoolCallback outerCallback, Networking::JsonResponse response);
void createDirectoryInnerCallback(BoolCallback outerCallback, const Networking::JsonResponse &response);
protected:
/**
* @return "box"
*/
virtual Common::String cloudProvider();
Common::String cloudProvider() override;
/**
* @return kStorageBoxId
*/
virtual uint32 storageIndex();
uint32 storageIndex() override;
virtual bool needsRefreshToken();
bool needsRefreshToken() override;
virtual bool canReuseRefreshToken();
bool canReuseRefreshToken() override;
public:
/** This constructor uses OAuth code flow to get tokens. */
BoxStorage(Common::String code, Networking::ErrorCallback cb);
BoxStorage(const Common::String &code, Networking::ErrorCallback cb);
/** This constructor extracts tokens from JSON acquired via OAuth code flow. */
BoxStorage(Networking::JsonResponse codeFlowJson, Networking::ErrorCallback cb);
BoxStorage(const Networking::JsonResponse &codeFlowJson, Networking::ErrorCallback cb);
virtual ~BoxStorage();
~BoxStorage() override;
/**
* Storage methods, which are used by CloudManager to save
@ -72,47 +72,47 @@ public:
* @note every Storage must write keyPrefix + "type" key
* with common value (e.g. "Dropbox").
*/
virtual void saveConfig(Common::String keyPrefix);
void saveConfig(const Common::String &keyPrefix) override;
/**
* Return unique storage name.
* @returns some unique storage name (for example, "Dropbox (user@example.com)")
*/
virtual Common::String name() const;
Common::String name() const override;
/** Public Cloud API comes down there. */
virtual Networking::Request *listDirectoryById(Common::String id, ListDirectoryCallback callback, Networking::ErrorCallback errorCallback);
virtual Networking::Request *createDirectoryWithParentId(Common::String parentId, Common::String directoryName, BoolCallback callback, Networking::ErrorCallback errorCallback);
Networking::Request *listDirectoryById(const Common::String &id, ListDirectoryCallback callback, Networking::ErrorCallback errorCallback) override;
Networking::Request *createDirectoryWithParentId(const Common::String &parentId, const Common::String &directoryName, BoolCallback callback, Networking::ErrorCallback errorCallback) override;
/** Returns UploadStatus struct with info about uploaded file. */
virtual Networking::Request *upload(Common::String remotePath, Common::String localPath, UploadCallback callback, Networking::ErrorCallback errorCallback);
virtual Networking::Request *upload(Common::String path, Common::SeekableReadStream *contents, UploadCallback callback, Networking::ErrorCallback errorCallback);
Networking::Request *upload(const Common::String &remotePath, const Common::String &localPath, UploadCallback callback, Networking::ErrorCallback errorCallback) override;
Networking::Request *upload(const Common::String &path, Common::SeekableReadStream *contents, UploadCallback callback, Networking::ErrorCallback errorCallback) override;
/** Returns whether Storage supports upload(ReadStream). */
virtual bool uploadStreamSupported();
bool uploadStreamSupported() override;
/** Returns pointer to Networking::NetworkReadStream. */
virtual Networking::Request *streamFileById(Common::String path, Networking::NetworkReadStreamCallback callback, Networking::ErrorCallback errorCallback);
Networking::Request *streamFileById(const Common::String &path, Networking::NetworkReadStreamCallback callback, Networking::ErrorCallback errorCallback) override;
/** Returns the StorageInfo struct. */
virtual Networking::Request *info(StorageInfoCallback callback, Networking::ErrorCallback errorCallback);
Networking::Request *info(StorageInfoCallback callback, Networking::ErrorCallback errorCallback) override;
/** Returns storage's saves directory path with the trailing slash. */
virtual Common::String savesDirectoryPath();
Common::String savesDirectoryPath() override;
/**
* Load token and user id from configs and return BoxStorage for those.
* @return pointer to the newly created BoxStorage or 0 if some problem occurred.
*/
static BoxStorage *loadFromConfig(Common::String keyPrefix);
static BoxStorage *loadFromConfig(const Common::String &keyPrefix);
/**
* Remove all BoxStorage-related data from config.
*/
static void removeFromConfig(Common::String keyPrefix);
static void removeFromConfig(const Common::String &keyPrefix);
virtual Common::String getRootDirectoryId();
Common::String getRootDirectoryId() override;
Common::String accessToken() const { return _token; }
};

14
backends/cloud/box/boxtokenrefresher.cpp
View File

@ -36,7 +36,7 @@ BoxTokenRefresher::BoxTokenRefresher(BoxStorage *parent, Networking::JsonCallbac
BoxTokenRefresher::~BoxTokenRefresher() {}
void BoxTokenRefresher::tokenRefreshed(Storage::BoolResponse response) {
void BoxTokenRefresher::tokenRefreshed(const Storage::BoolResponse &response) {
if (!response.value) {
//failed to refresh token, notify user with NULL in original callback
warning("BoxTokenRefresher: failed to refresh token");
@ -56,7 +56,7 @@ void BoxTokenRefresher::tokenRefreshed(Storage::BoolResponse response) {
retry(0);
}
void BoxTokenRefresher::finishJson(Common::JSONValue *json) {
void BoxTokenRefresher::finishJson(const Common::JSONValue *json) {
if (!json) {
//that's probably not an error (200 OK)
CurlJsonRequest::finishJson(nullptr);
@ -98,7 +98,7 @@ void BoxTokenRefresher::finishJson(Common::JSONValue *json) {
pause();
delete json;
_parentStorage->refreshAccessToken(new Common::Callback<BoxTokenRefresher, Storage::BoolResponse>(this, &BoxTokenRefresher::tokenRefreshed));
_parentStorage->refreshAccessToken(new Common::Callback<BoxTokenRefresher, const Storage::BoolResponse &>(this, &BoxTokenRefresher::tokenRefreshed));
return;
}
}
@ -107,10 +107,10 @@ void BoxTokenRefresher::finishJson(Common::JSONValue *json) {
CurlJsonRequest::finishJson(json);
}
void BoxTokenRefresher::finishError(Networking::ErrorResponse error, Networking::RequestState state) {
void BoxTokenRefresher::finishError(const Networking::ErrorResponse &error, Networking::RequestState state) {
if (error.httpResponseCode == 401) { // invalid_token
pause();
_parentStorage->refreshAccessToken(new Common::Callback<BoxTokenRefresher, Storage::BoolResponse>(this, &BoxTokenRefresher::tokenRefreshed));
_parentStorage->refreshAccessToken(new Common::Callback<BoxTokenRefresher, const Storage::BoolResponse &>(this, &BoxTokenRefresher::tokenRefreshed));
return;
}
@ -120,7 +120,7 @@ void BoxTokenRefresher::finishError(Networking::ErrorResponse error, Networking:
Request::finishError(error);
}
void BoxTokenRefresher::setHeaders(Common::Array<Common::String> &headers) {
void BoxTokenRefresher::setHeaders(const Common::Array<Common::String> &headers) {
_headers = headers;
curl_slist_free_all(_headersList);
_headersList = nullptr;
@ -128,7 +128,7 @@ void BoxTokenRefresher::setHeaders(Common::Array<Common::String> &headers) {
CurlJsonRequest::addHeader(headers[i]);
}
void BoxTokenRefresher::addHeader(Common::String header) {
void BoxTokenRefresher::addHeader(const Common::String &header) {
_headers.push_back(header);
CurlJsonRequest::addHeader(header);
}

12
backends/cloud/box/boxtokenrefresher.h
View File

@ -34,16 +34,16 @@ class BoxTokenRefresher: public Networking::CurlJsonRequest {
BoxStorage *_parentStorage;
Common::Array<Common::String> _headers;
void tokenRefreshed(Storage::BoolResponse response);
void tokenRefreshed(const Storage::BoolResponse &response);
virtual void finishJson(Common::JSONValue *json);
virtual void finishError(Networking::ErrorResponse error, Networking::RequestState state = Networking::FINISHED);
void finishJson(const Common::JSONValue *json) override;
void finishError(const Networking::ErrorResponse &error, Networking::RequestState state = Networking::FINISHED) override;
public:
BoxTokenRefresher(BoxStorage *parent, Networking::JsonCallback callback, Networking::ErrorCallback ecb, const char *url);
virtual ~BoxTokenRefresher();
~BoxTokenRefresher() override;
virtual void setHeaders(Common::Array<Common::String> &headers);
virtual void addHeader(Common::String header);
void setHeaders(const Common::Array<Common::String> &headers) override;
void addHeader(const Common::String &header) override;
};
} // End of namespace Box

24
backends/cloud/box/boxuploadrequest.cpp
View File

@ -34,7 +34,7 @@ namespace Box {
#define BOX_API_FILES "https://upload.box.com/api/2.0/files"
BoxUploadRequest::BoxUploadRequest(BoxStorage *storage, Common::String path, Common::String localPath, Storage::UploadCallback callback, Networking::ErrorCallback ecb):
BoxUploadRequest::BoxUploadRequest(BoxStorage *storage, const Common::String &path, const Common::String &localPath, Storage::UploadCallback callback, Networking::ErrorCallback ecb):
Networking::Request(nullptr, ecb), _storage(storage), _savePath(path), _localPath(localPath), _uploadCallback(callback),
_workingRequest(nullptr), _ignoreCallback(false) {
start();
@ -60,19 +60,19 @@ void BoxUploadRequest::start() {
void BoxUploadRequest::resolveId() {
//check whether such file already exists
Storage::UploadCallback innerCallback = new Common::Callback<BoxUploadRequest, Storage::UploadResponse>(this, &BoxUploadRequest::idResolvedCallback);
Networking::ErrorCallback innerErrorCallback = new Common::Callback<BoxUploadRequest, Networking::ErrorResponse>(this, &BoxUploadRequest::idResolveFailedCallback);
Storage::UploadCallback innerCallback = new Common::Callback<BoxUploadRequest, const Storage::UploadResponse &>(this, &BoxUploadRequest::idResolvedCallback);
Networking::ErrorCallback innerErrorCallback = new Common::Callback<BoxUploadRequest, const Networking::ErrorResponse &>(this, &BoxUploadRequest::idResolveFailedCallback);
_workingRequest = _storage->resolveFileId(_savePath, innerCallback, innerErrorCallback);
}
void BoxUploadRequest::idResolvedCallback(Storage::UploadResponse response) {
void BoxUploadRequest::idResolvedCallback(const Storage::UploadResponse &response) {
_workingRequest = nullptr;
if (_ignoreCallback) return;
_resolvedId = response.value.id();
upload();
}
void BoxUploadRequest::idResolveFailedCallback(Networking::ErrorResponse error) {
void BoxUploadRequest::idResolveFailedCallback(const Networking::ErrorResponse &error) {
_workingRequest = nullptr;
if (_ignoreCallback) return;
@ -107,8 +107,8 @@ void BoxUploadRequest::upload() {
if (_resolvedId != "")
url += "/" + _resolvedId;
url += "/content";
Networking::JsonCallback callback = new Common::Callback<BoxUploadRequest, Networking::JsonResponse>(this, &BoxUploadRequest::uploadedCallback);
Networking::ErrorCallback failureCallback = new Common::Callback<BoxUploadRequest, Networking::ErrorResponse>(this, &BoxUploadRequest::notUploadedCallback);
Networking::JsonCallback callback = new Common::Callback<BoxUploadRequest, const Networking::JsonResponse &>(this, &BoxUploadRequest::uploadedCallback);
Networking::ErrorCallback failureCallback = new Common::Callback<BoxUploadRequest, const Networking::ErrorResponse &>(this, &BoxUploadRequest::notUploadedCallback);
Networking::CurlJsonRequest *request = new BoxTokenRefresher(_storage, callback, failureCallback, url.c_str());
request->addHeader("Authorization: Bearer " + _storage->accessToken());
@ -127,12 +127,12 @@ void BoxUploadRequest::upload() {
_workingRequest = ConnMan.addRequest(request);
}
void BoxUploadRequest::uploadedCallback(Networking::JsonResponse response) {
void BoxUploadRequest::uploadedCallback(const Networking::JsonResponse &response) {
_workingRequest = nullptr;
if (_ignoreCallback) return;
Networking::ErrorResponse error(this, false, true, "", -1);
Networking::CurlJsonRequest *rq = (Networking::CurlJsonRequest *)response.request;
const Networking::CurlJsonRequest *rq = (const Networking::CurlJsonRequest *)response.request;
if (rq) {
const Networking::NetworkReadStream *stream = rq->getNetworkReadStream();
if (stream) {
@ -145,7 +145,7 @@ void BoxUploadRequest::uploadedCallback(Networking::JsonResponse response) {
warning("BoxUploadRequest: looks like an error (bad HTTP code)");
//check JSON and show warnings if it's malformed
Common::JSONValue *json = response.value;
const Common::JSONValue *json = response.value;
if (json == nullptr) {
error.response = "Failed to parse JSON, null passed!";
finishError(error);
@ -211,7 +211,7 @@ void BoxUploadRequest::uploadedCallback(Networking::JsonResponse response) {
delete json;
}
void BoxUploadRequest::notUploadedCallback(Networking::ErrorResponse error) {
void BoxUploadRequest::notUploadedCallback(const Networking::ErrorResponse &error) {
_workingRequest = nullptr;
if (_ignoreCallback) return;
finishError(error);
@ -221,7 +221,7 @@ void BoxUploadRequest::handle() {}
void BoxUploadRequest::restart() { start(); }
void BoxUploadRequest::finishUpload(StorageFile file) {
void BoxUploadRequest::finishUpload(const StorageFile &file) {
Request::finishSuccess();
if (_uploadCallback)
(*_uploadCallback)(Storage::UploadResponse(this, file));

18
backends/cloud/box/boxuploadrequest.h
View File

@ -41,19 +41,19 @@ class BoxUploadRequest: public Networking::Request {
void start();
void resolveId();
void idResolvedCallback(Storage::UploadResponse response);
void idResolveFailedCallback(Networking::ErrorResponse error);
void idResolvedCallback(const Storage::UploadResponse &response);
void idResolveFailedCallback(const Networking::ErrorResponse &error);
void upload();
void uploadedCallback(Networking::JsonResponse response);
void notUploadedCallback(Networking::ErrorResponse error);
void finishUpload(StorageFile status);
void uploadedCallback(const Networking::JsonResponse &response);
void notUploadedCallback(const Networking::ErrorResponse &error);
void finishUpload(const StorageFile &status);
public:
BoxUploadRequest(BoxStorage *storage, Common::String path, Common::String localPath, Storage::UploadCallback callback, Networking::ErrorCallback ecb);
virtual ~BoxUploadRequest();
BoxUploadRequest(BoxStorage *storage, const Common::String &path, const Common::String &localPath, Storage::UploadCallback callback, Networking::ErrorCallback ecb);
~BoxUploadRequest() override;
virtual void handle();
virtual void restart();
void handle() override;
void restart() override;
};
} // End of namespace Box

14
backends/cloud/cloudmanager.cpp
View File

@ -237,7 +237,7 @@ Common::String CloudManager::getStorageLastSync(uint32 index) {
return _storages[index].lastSyncDate;
}
void CloudManager::setStorageUsername(uint32 index, Common::String name) {
void CloudManager::setStorageUsername(uint32 index, const Common::String &name) {
if (index >= _storages.size())
return;
_storages[index].username = name;
@ -251,14 +251,14 @@ void CloudManager::setStorageUsedSpace(uint32 index, uint64 used) {
save();
}
void CloudManager::setStorageLastSync(uint32 index, Common::String date) {
void CloudManager::setStorageLastSync(uint32 index, const Common::String &date) {
if (index >= _storages.size())
return;
_storages[index].lastSyncDate = date;
save();
}
void CloudManager::connectStorage(uint32 index, Common::String code, Networking::ErrorCallback cb) {
void CloudManager::connectStorage(uint32 index, const Common::String &code, Networking::ErrorCallback cb) {
freeStorages();
switch (index) {
@ -309,7 +309,7 @@ void CloudManager::connectStorage(uint32 index, Networking::JsonResponse codeFlo
}
bool CloudManager::connectStorage(Networking::JsonResponse codeFlowJson, Networking::ErrorCallback cb) {
Common::JSONValue *json = (Common::JSONValue *)codeFlowJson.value;
const Common::JSONValue *json = codeFlowJson.value;
if (json == nullptr || !json->isObject()) {
return false;
}
@ -381,7 +381,7 @@ void CloudManager::disconnectStorage(uint32 index) {
}
Networking::Request *CloudManager::listDirectory(Common::String path, Storage::ListDirectoryCallback callback, Networking::ErrorCallback errorCallback, bool recursive) {
Networking::Request *CloudManager::listDirectory(const Common::String &path, Storage::ListDirectoryCallback callback, Networking::ErrorCallback errorCallback, bool recursive) {
Storage *storage = getCurrentStorage();
if (storage) {
return storage->listDirectory(path, callback, errorCallback, recursive);
@ -393,7 +393,7 @@ Networking::Request *CloudManager::listDirectory(Common::String path, Storage::L
return nullptr;
}
Networking::Request *CloudManager::downloadFolder(Common::String remotePath, Common::String localPath, Storage::FileArrayCallback callback, Networking::ErrorCallback errorCallback, bool recursive) {
Networking::Request *CloudManager::downloadFolder(const Common::String &remotePath, const Common::String &localPath, Storage::FileArrayCallback callback, Networking::ErrorCallback errorCallback, bool recursive) {
Storage *storage = getCurrentStorage();
if (storage) {
return storage->downloadFolder(remotePath, localPath, callback, errorCallback, recursive);
@ -514,7 +514,7 @@ void CloudManager::showCloudDisabledIcon() {
///// DownloadFolderRequest-related /////
bool CloudManager::startDownload(Common::String remotePath, Common::String localPath) const {
bool CloudManager::startDownload(const Common::String &remotePath, const Common::String &localPath) const {
Storage *storage = getCurrentStorage();
if (storage)
return storage->startDownload(remotePath, localPath);

14
backends/cloud/cloudmanager.h
View File

@ -90,7 +90,7 @@ class CloudManager : public Common::Singleton<CloudManager>, public Common::Even
public:
CloudManager();
virtual ~CloudManager();
~CloudManager() override;
/**
* Loads all information from configs and creates current Storage instance.
@ -178,7 +178,7 @@ public:
* @param index Storage's index.
* @param name username to set
*/
void setStorageUsername(uint32 index, Common::String name);
void setStorageUsername(uint32 index, const Common::String &name);
/**
* Set Storage's used space field.
@ -196,7 +196,7 @@ public:
* @param index Storage's index.
* @param date date to set
*/
void setStorageLastSync(uint32 index, Common::String date);
void setStorageLastSync(uint32 index, const Common::String &date);
/**
* Replace Storage which has given index with a
@ -206,7 +206,7 @@ public:
* @param code OAuth2 code received from user
* @param cb callback to notify of success or error
*/
void connectStorage(uint32 index, Common::String code, Networking::ErrorCallback cb = nullptr);
void connectStorage(uint32 index, const Common::String &code, Networking::ErrorCallback cb = nullptr);
/**
* Replace Storage which has given index with a
@ -237,10 +237,10 @@ public:
void disconnectStorage(uint32 index);
/** Returns ListDirectoryResponse with list of files. */
Networking::Request *listDirectory(Common::String path, Storage::ListDirectoryCallback callback, Networking::ErrorCallback errorCallback, bool recursive = false);
Networking::Request *listDirectory(const Common::String &path, Storage::ListDirectoryCallback callback, Networking::ErrorCallback errorCallback, bool recursive = false);
/** Returns Common::Array<StorageFile> with list of files, which were not downloaded. */
Networking::Request *downloadFolder(Common::String remotePath, Common::String localPath, Storage::FileArrayCallback callback, Networking::ErrorCallback errorCallback, bool recursive = false);
Networking::Request *downloadFolder(const Common::String &remotePath, const Common::String &localPath, Storage::FileArrayCallback callback, Networking::ErrorCallback errorCallback, bool recursive = false);
/** Return the StorageInfo struct. */
Networking::Request *info(Storage::StorageInfoCallback callback, Networking::ErrorCallback errorCallback);
@ -291,7 +291,7 @@ public:
///// DownloadFolderRequest-related /////
/** Starts a folder download. */
bool startDownload(Common::String remotePath, Common::String localPath) const;
bool startDownload(const Common::String &remotePath, const Common::String &localPath) const;
/** Cancels running download. */
void cancelDownload() const;

14
backends/cloud/downloadrequest.cpp
View File

@ -25,7 +25,7 @@
namespace Cloud {
DownloadRequest::DownloadRequest(Storage *storage, Storage::BoolCallback callback, Networking::ErrorCallback ecb, Common::String remoteFileId, Common::DumpFile *dumpFile):
DownloadRequest::DownloadRequest(Storage *storage, Storage::BoolCallback callback, Networking::ErrorCallback ecb, const Common::String &remoteFileId, Common::DumpFile *dumpFile):
Request(nullptr, ecb), _boolCallback(callback), _localFile(dumpFile), _remoteFileId(remoteFileId), _storage(storage),
_remoteFileStream(nullptr), _workingRequest(nullptr), _ignoreCallback(false), _buffer(new byte[DOWNLOAD_REQUEST_BUFFER_SIZE]) {
start();
@ -50,19 +50,19 @@ void DownloadRequest::start() {
_workingRequest = _storage->streamFileById(
_remoteFileId,
new Common::Callback<DownloadRequest, Networking::NetworkReadStreamResponse>(this, &DownloadRequest::streamCallback),
new Common::Callback<DownloadRequest, Networking::ErrorResponse>(this, &DownloadRequest::streamErrorCallback)
new Common::Callback<DownloadRequest, const Networking::NetworkReadStreamResponse &>(this, &DownloadRequest::streamCallback),
new Common::Callback<DownloadRequest, const Networking::ErrorResponse &>(this, &DownloadRequest::streamErrorCallback)
);
}
void DownloadRequest::streamCallback(Networking::NetworkReadStreamResponse response) {
void DownloadRequest::streamCallback(const Networking::NetworkReadStreamResponse &response) {
_workingRequest = nullptr;
if (_ignoreCallback)
return;
_remoteFileStream = (Networking::NetworkReadStream *)response.value;
_remoteFileStream = response.value;
}
void DownloadRequest::streamErrorCallback(Networking::ErrorResponse error) {
void DownloadRequest::streamErrorCallback(const Networking::ErrorResponse &error) {
_workingRequest = nullptr;
if (_ignoreCallback)
return;
@ -122,7 +122,7 @@ void DownloadRequest::finishDownload(bool success) {
(*_boolCallback)(Storage::BoolResponse(this, success));
}
void DownloadRequest::finishError(Networking::ErrorResponse error, Networking::RequestState state) {
void DownloadRequest::finishError(const Networking::ErrorResponse &error, Networking::RequestState state) {
if (_localFile)
_localFile->close();
Request::finishError(error);

14
backends/cloud/downloadrequest.h
View File

@ -42,17 +42,17 @@ class DownloadRequest: public Networking::Request {
byte *_buffer;
void start();
void streamCallback(Networking::NetworkReadStreamResponse response);
void streamErrorCallback(Networking::ErrorResponse error);
void streamCallback(const Networking::NetworkReadStreamResponse &response);
void streamErrorCallback(const Networking::ErrorResponse &error);
void finishDownload(bool success);
virtual void finishError(Networking::ErrorResponse error, Networking::RequestState state = Networking::FINISHED);
void finishError(const Networking::ErrorResponse &error, Networking::RequestState state = Networking::FINISHED) override;
public:
DownloadRequest(Storage *storage, Storage::BoolCallback callback, Networking::ErrorCallback ecb, Common::String remoteFileId, Common::DumpFile *dumpFile);
virtual ~DownloadRequest();
DownloadRequest(Storage *storage, Storage::BoolCallback callback, Networking::ErrorCallback ecb, const Common::String &remoteFileId, Common::DumpFile *dumpFile);
~DownloadRequest() override;
virtual void handle();
virtual void restart();
void handle() override;
void restart() override;
/** Returns a number in range [0, 1], where 1 is "complete". */
double getProgress() const;

14
backends/cloud/dropbox/dropboxcreatedirectoryrequest.cpp
View File

@ -33,7 +33,7 @@ namespace Dropbox {
#define DROPBOX_API_CREATE_FOLDER "https://api.dropboxapi.com/2/files/create_folder"
DropboxCreateDirectoryRequest::DropboxCreateDirectoryRequest(DropboxStorage *storage, Common::String path, Storage::BoolCallback cb, Networking::ErrorCallback ecb):
DropboxCreateDirectoryRequest::DropboxCreateDirectoryRequest(DropboxStorage *storage, const Common::String &path, Storage::BoolCallback cb, Networking::ErrorCallback ecb):
Networking::Request(nullptr, ecb), _storage(storage), _path(path), _boolCallback(cb),
_workingRequest(nullptr), _ignoreCallback(false) {
start();
@ -52,8 +52,8 @@ void DropboxCreateDirectoryRequest::start() {
_workingRequest->finish();
_ignoreCallback = false;
Networking::JsonCallback innerCallback = new Common::Callback<DropboxCreateDirectoryRequest, Networking::JsonResponse>(this, &DropboxCreateDirectoryRequest::responseCallback);
Networking::ErrorCallback errorResponseCallback = new Common::Callback<DropboxCreateDirectoryRequest, Networking::ErrorResponse>(this, &DropboxCreateDirectoryRequest::errorCallback);
Networking::JsonCallback innerCallback = new Common::Callback<DropboxCreateDirectoryRequest, const Networking::JsonResponse &>(this, &DropboxCreateDirectoryRequest::responseCallback);
Networking::ErrorCallback errorResponseCallback = new Common::Callback<DropboxCreateDirectoryRequest, const Networking::ErrorResponse &>(this, &DropboxCreateDirectoryRequest::errorCallback);
Networking::CurlJsonRequest *request = new DropboxTokenRefresher(_storage, innerCallback, errorResponseCallback, DROPBOX_API_CREATE_FOLDER);
request->addHeader("Authorization: Bearer " + _storage->accessToken());
request->addHeader("Content-Type: application/json");
@ -66,8 +66,8 @@ void DropboxCreateDirectoryRequest::start() {
_workingRequest = ConnMan.addRequest(request);
}
void DropboxCreateDirectoryRequest::responseCallback(Networking::JsonResponse response) {
Common::JSONValue *json = response.value;
void DropboxCreateDirectoryRequest::responseCallback(const Networking::JsonResponse &response) {
const Common::JSONValue *json = response.value;
_workingRequest = nullptr;
if (_ignoreCallback) {
delete json;
@ -76,7 +76,7 @@ void DropboxCreateDirectoryRequest::responseCallback(Networking::JsonResponse re
if (response.request) _date = response.request->date();
Networking::ErrorResponse error(this, "DropboxCreateDirectoryRequest::responseCallback: unknown error");
Networking::CurlJsonRequest *rq = (Networking::CurlJsonRequest *)response.request;
const Networking::CurlJsonRequest *rq = (const Networking::CurlJsonRequest *)response.request;
if (rq && rq->getNetworkReadStream())
error.httpResponseCode = rq->getNetworkReadStream()->httpResponseCode();
@ -113,7 +113,7 @@ void DropboxCreateDirectoryRequest::responseCallback(Networking::JsonResponse re
delete json;
}
void DropboxCreateDirectoryRequest::errorCallback(Networking::ErrorResponse error) {
void DropboxCreateDirectoryRequest::errorCallback(const Networking::ErrorResponse &error) {
_workingRequest = nullptr;
if (_ignoreCallback)
return;

14
backends/cloud/dropbox/dropboxcreatedirectoryrequest.h
View File

@ -40,16 +40,16 @@ class DropboxCreateDirectoryRequest: public Networking::Request {
Common::String _date;
void start();
void responseCallback(Networking::JsonResponse response);
void errorCallback(Networking::ErrorResponse error);
void responseCallback(const Networking::JsonResponse &response);
void errorCallback(const Networking::ErrorResponse &error);
void finishCreation(bool success);
public:
DropboxCreateDirectoryRequest(DropboxStorage *storage, Common::String path, Storage::BoolCallback cb, Networking::ErrorCallback ecb);
virtual ~DropboxCreateDirectoryRequest();
DropboxCreateDirectoryRequest(DropboxStorage *storage, const Common::String &path, Storage::BoolCallback cb, Networking::ErrorCallback ecb);
~DropboxCreateDirectoryRequest() override;
virtual void handle();
virtual void restart();
virtual Common::String date() const;
void handle() override;
void restart() override;
Common::String date() const override;
};
} // End of namespace Dropbox

24
backends/cloud/dropbox/dropboxinforequest.cpp
View File

@ -54,8 +54,8 @@ void DropboxInfoRequest::start() {
_workingRequest->finish();
_ignoreCallback = false;
Networking::JsonCallback innerCallback = new Common::Callback<DropboxInfoRequest, Networking::JsonResponse>(this, &DropboxInfoRequest::userResponseCallback);
Networking::ErrorCallback errorResponseCallback = new Common::Callback<DropboxInfoRequest, Networking::ErrorResponse>(this, &DropboxInfoRequest::errorCallback);
Networking::JsonCallback innerCallback = new Common::Callback<DropboxInfoRequest, const Networking::JsonResponse &>(this, &DropboxInfoRequest::userResponseCallback);
Networking::ErrorCallback errorResponseCallback = new Common::Callback<DropboxInfoRequest, const Networking::ErrorResponse &>(this, &DropboxInfoRequest::errorCallback);
Networking::CurlJsonRequest *request = new DropboxTokenRefresher(_storage, innerCallback, errorResponseCallback, DROPBOX_API_GET_CURRENT_ACCOUNT);
request->addHeader("Authorization: Bearer " + _storage->accessToken());
request->addHeader("Content-Type: application/json");
@ -64,8 +64,8 @@ void DropboxInfoRequest::start() {
_workingRequest = ConnMan.addRequest(request);
}
void DropboxInfoRequest::userResponseCallback(Networking::JsonResponse response) {
Common::JSONValue *json = response.value;
void DropboxInfoRequest::userResponseCallback(const Networking::JsonResponse &response) {
const Common::JSONValue *json = response.value;
_workingRequest = nullptr;
if (_ignoreCallback) {
delete json;
@ -73,7 +73,7 @@ void DropboxInfoRequest::userResponseCallback(Networking::JsonResponse response)
}
Networking::ErrorResponse error(this, "DropboxInfoRequest::userResponseCallback: unknown error");
Networking::CurlJsonRequest *rq = (Networking::CurlJsonRequest *)response.request;
const Networking::CurlJsonRequest *rq = (const Networking::CurlJsonRequest *)response.request;
if (rq && rq->getNetworkReadStream())
error.httpResponseCode = rq->getNetworkReadStream()->httpResponseCode();
@ -108,8 +108,8 @@ void DropboxInfoRequest::userResponseCallback(Networking::JsonResponse response)
CloudMan.setStorageUsername(kStorageDropboxId, _email);
delete json;
Networking::JsonCallback innerCallback = new Common::Callback<DropboxInfoRequest, Networking::JsonResponse>(this, &DropboxInfoRequest::quotaResponseCallback);
Networking::ErrorCallback errorResponseCallback = new Common::Callback<DropboxInfoRequest, Networking::ErrorResponse>(this, &DropboxInfoRequest::errorCallback);
Networking::JsonCallback innerCallback = new Common::Callback<DropboxInfoRequest, const Networking::JsonResponse &>(this, &DropboxInfoRequest::quotaResponseCallback);
Networking::ErrorCallback errorResponseCallback = new Common::Callback<DropboxInfoRequest, const Networking::ErrorResponse &>(this, &DropboxInfoRequest::errorCallback);
Networking::CurlJsonRequest *request = new DropboxTokenRefresher(_storage, innerCallback, errorResponseCallback, DROPBOX_API_GET_SPACE_USAGE);
request->addHeader("Authorization: Bearer " + _storage->accessToken());
request->addHeader("Content-Type: application/json");
@ -118,8 +118,8 @@ void DropboxInfoRequest::userResponseCallback(Networking::JsonResponse response)
_workingRequest = ConnMan.addRequest(request);
}
void DropboxInfoRequest::quotaResponseCallback(Networking::JsonResponse response) {
Common::JSONValue *json = response.value;
void DropboxInfoRequest::quotaResponseCallback(const Networking::JsonResponse &response) {
const Common::JSONValue *json = response.value;
_workingRequest = nullptr;
if (_ignoreCallback) {
delete json;
@ -127,7 +127,7 @@ void DropboxInfoRequest::quotaResponseCallback(Networking::JsonResponse response
}
Networking::ErrorResponse error(this, "DropboxInfoRequest::quotaResponseCallback: unknown error");
Networking::CurlJsonRequest *rq = (Networking::CurlJsonRequest *)response.request;
const Networking::CurlJsonRequest *rq = (const Networking::CurlJsonRequest *)response.request;
if (rq && rq->getNetworkReadStream())
error.httpResponseCode = rq->getNetworkReadStream()->httpResponseCode();
@ -173,7 +173,7 @@ void DropboxInfoRequest::quotaResponseCallback(Networking::JsonResponse response
delete json;
}
void DropboxInfoRequest::errorCallback(Networking::ErrorResponse error) {
void DropboxInfoRequest::errorCallback(const Networking::ErrorResponse &error) {
_workingRequest = nullptr;
if (_ignoreCallback) return;
finishError(error);
@ -183,7 +183,7 @@ void DropboxInfoRequest::handle() {}
void DropboxInfoRequest::restart() { start(); }
void DropboxInfoRequest::finishInfo(StorageInfo info) {
void DropboxInfoRequest::finishInfo(const StorageInfo &info) {
Request::finishSuccess();
if (_infoCallback)
(*_infoCallback)(Storage::StorageInfoResponse(this, info));

14
backends/cloud/dropbox/dropboxinforequest.h
View File

@ -39,16 +39,16 @@ class DropboxInfoRequest: public Networking::Request {
bool _ignoreCallback;
void start();
void userResponseCallback(Networking::JsonResponse response);
void quotaResponseCallback(Networking::JsonResponse response);
void errorCallback(Networking::ErrorResponse error);
void finishInfo(StorageInfo info);
void userResponseCallback(const Networking::JsonResponse &response);
void quotaResponseCallback(const Networking::JsonResponse &response);
void errorCallback(const Networking::ErrorResponse &error);
void finishInfo(const StorageInfo &info);
public:
DropboxInfoRequest(DropboxStorage *storage, Storage::StorageInfoCallback cb, Networking::ErrorCallback ecb);
virtual ~DropboxInfoRequest();
~DropboxInfoRequest() override;
virtual void handle();
virtual void restart();
void handle() override;
void restart() override;
};
} // End of namespace Dropbox

20
backends/cloud/dropbox/dropboxlistdirectoryrequest.cpp
View File

@ -36,7 +36,7 @@ namespace Dropbox {
#define DROPBOX_API_LIST_FOLDER "https://api.dropboxapi.com/2/files/list_folder"
#define DROPBOX_API_LIST_FOLDER_CONTINUE "https://api.dropboxapi.com/2/files/list_folder/continue"
DropboxListDirectoryRequest::DropboxListDirectoryRequest(DropboxStorage *storage, Common::String path, Storage::ListDirectoryCallback cb, Networking::ErrorCallback ecb, bool recursive):
DropboxListDirectoryRequest::DropboxListDirectoryRequest(DropboxStorage *storage, const Common::String &path, Storage::ListDirectoryCallback cb, Networking::ErrorCallback ecb, bool recursive):
Networking::Request(nullptr, ecb), _requestedPath(path), _requestedRecursive(recursive), _listDirectoryCallback(cb),
_storage(storage), _workingRequest(nullptr), _ignoreCallback(false) {
start();
@ -56,8 +56,8 @@ void DropboxListDirectoryRequest::start() {
_files.clear();
_ignoreCallback = false;
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::JsonCallback callback = new Common::Callback<DropboxListDirectoryRequest, const Networking::JsonResponse &>(this, &DropboxListDirectoryRequest::responseCallback);
Networking::ErrorCallback failureCallback = new Common::Callback<DropboxListDirectoryRequest, const Networking::ErrorResponse &>(this, &DropboxListDirectoryRequest::errorCallback);
Networking::CurlJsonRequest *request = new DropboxTokenRefresher(_storage, callback, failureCallback, DROPBOX_API_LIST_FOLDER);
request->addHeader("Authorization: Bearer " + _storage->accessToken());
request->addHeader("Content-Type: application/json");
@ -74,7 +74,7 @@ void DropboxListDirectoryRequest::start() {
_workingRequest = ConnMan.addRequest(request);
}
void DropboxListDirectoryRequest::responseCallback(Networking::JsonResponse response) {
void DropboxListDirectoryRequest::responseCallback(const Networking::JsonResponse &response) {
_workingRequest = nullptr;
if (_ignoreCallback) {
@ -86,11 +86,11 @@ void DropboxListDirectoryRequest::responseCallback(Networking::JsonResponse resp
_date = response.request->date();
Networking::ErrorResponse error(this, "DropboxListDirectoryRequest::responseCallback: unknown error");
Networking::CurlJsonRequest *rq = (Networking::CurlJsonRequest *)response.request;
const Networking::CurlJsonRequest *rq = (const Networking::CurlJsonRequest *)response.request;
if (rq && rq->getNetworkReadStream())
error.httpResponseCode = rq->getNetworkReadStream()->httpResponseCode();
Common::JSONValue *json = response.value;
const Common::JSONValue *json = response.value;
if (json == nullptr) {
error.response = "Failed to parse JSON, null passed!";
finishError(error);
@ -179,8 +179,8 @@ void DropboxListDirectoryRequest::responseCallback(Networking::JsonResponse resp
return;
}
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::JsonCallback callback = new Common::Callback<DropboxListDirectoryRequest, const Networking::JsonResponse &>(this, &DropboxListDirectoryRequest::responseCallback);
Networking::ErrorCallback failureCallback = new Common::Callback<DropboxListDirectoryRequest, const Networking::ErrorResponse &>(this, &DropboxListDirectoryRequest::errorCallback);
Networking::CurlJsonRequest *request = new DropboxTokenRefresher(_storage, callback, failureCallback, DROPBOX_API_LIST_FOLDER_CONTINUE);
request->addHeader("Authorization: Bearer " + _storage->accessToken());
request->addHeader("Content-Type: application/json");
@ -199,7 +199,7 @@ void DropboxListDirectoryRequest::responseCallback(Networking::JsonResponse resp
delete json;
}
void DropboxListDirectoryRequest::errorCallback(Networking::ErrorResponse error) {
void DropboxListDirectoryRequest::errorCallback(const Networking::ErrorResponse &error) {
_workingRequest = nullptr;
if (_ignoreCallback)
return;
@ -214,7 +214,7 @@ void DropboxListDirectoryRequest::restart() { start(); }
Common::String DropboxListDirectoryRequest::date() const { return _date; }
void DropboxListDirectoryRequest::finishListing(Common::Array<StorageFile> &files) {
void DropboxListDirectoryRequest::finishListing(const Common::Array<StorageFile> &files) {
Request::finishSuccess();
if (_listDirectoryCallback)
(*_listDirectoryCallback)(Storage::ListDirectoryResponse(this, files));

16
backends/cloud/dropbox/dropboxlistdirectoryrequest.h
View File

@ -44,16 +44,16 @@ class DropboxListDirectoryRequest: public Networking::Request {
Common::String _date;
void start();
void responseCallback(Networking::JsonResponse response);
void errorCallback(Networking::ErrorResponse error);
void finishListing(Common::Array<StorageFile> &files);
void responseCallback(const Networking::JsonResponse &response);
void errorCallback(const Networking::ErrorResponse &error);
void finishListing(const Common::Array<StorageFile> &files);
public:
DropboxListDirectoryRequest(DropboxStorage *storage, Common::String path, Storage::ListDirectoryCallback cb, Networking::ErrorCallback ecb, bool recursive = false);
virtual ~DropboxListDirectoryRequest();
DropboxListDirectoryRequest(DropboxStorage *storage, const Common::String &path, Storage::ListDirectoryCallback cb, Networking::ErrorCallback ecb, bool recursive = false);
~DropboxListDirectoryRequest() override;
virtual void handle();
virtual void restart();
virtual Common::String date() const;
void handle() override;
void restart() override;
Common::String date() const override;
};
} // End of namespace Dropbox

22
backends/cloud/dropbox/dropboxstorage.cpp
View File

@ -39,14 +39,14 @@ namespace Dropbox {
#define DROPBOX_API_FILES_DOWNLOAD "https://content.dropboxapi.com/2/files/download"
DropboxStorage::DropboxStorage(Common::String accessToken, Common::String refreshToken, bool enabled):
DropboxStorage::DropboxStorage(const Common::String &accessToken, const Common::String &refreshToken, bool enabled):
BaseStorage(accessToken, refreshToken, enabled) {}
DropboxStorage::DropboxStorage(Common::String code, Networking::ErrorCallback cb): BaseStorage() {
DropboxStorage::DropboxStorage(const Common::String &code, Networking::ErrorCallback cb): BaseStorage() {
getAccessToken(code, cb);
}
DropboxStorage::DropboxStorage(Networking::JsonResponse codeFlowJson, Networking::ErrorCallback cb) : BaseStorage() {
DropboxStorage::DropboxStorage(const Networking::JsonResponse &codeFlowJson, Networking::ErrorCallback cb) : BaseStorage() {
codeFlowComplete(cb, codeFlowJson);
}
@ -60,7 +60,7 @@ bool DropboxStorage::needsRefreshToken() { return true; }
bool DropboxStorage::canReuseRefreshToken() { return true; }
void DropboxStorage::saveConfig(Common::String keyPrefix) {
void DropboxStorage::saveConfig(const Common::String &keyPrefix) {
ConfMan.set(keyPrefix + "access_token", _token, ConfMan.kCloudDomain);
ConfMan.set(keyPrefix + "refresh_token", _refreshToken, ConfMan.kCloudDomain);
saveIsEnabledFlag(keyPrefix);
@ -70,15 +70,15 @@ Common::String DropboxStorage::name() const {
return "Dropbox";
}
Networking::Request *DropboxStorage::listDirectory(Common::String path, ListDirectoryCallback outerCallback, Networking::ErrorCallback errorCallback, bool recursive) {
Networking::Request *DropboxStorage::listDirectory(const Common::String &path, ListDirectoryCallback outerCallback, Networking::ErrorCallback errorCallback, bool recursive) {
return addRequest(new DropboxListDirectoryRequest(this, path, outerCallback, errorCallback, recursive));
}
Networking::Request *DropboxStorage::upload(Common::String path, Common::SeekableReadStream *contents, UploadCallback callback, Networking::ErrorCallback errorCallback) {
Networking::Request *DropboxStorage::upload(const Common::String &path, Common::SeekableReadStream *contents, UploadCallback callback, Networking::ErrorCallback errorCallback) {
return addRequest(new DropboxUploadRequest(this, path, contents, callback, errorCallback));
}
Networking::Request *DropboxStorage::streamFileById(Common::String path, Networking::NetworkReadStreamCallback callback, Networking::ErrorCallback errorCallback) {
Networking::Request *DropboxStorage::streamFileById(const Common::String &path, Networking::NetworkReadStreamCallback callback, Networking::ErrorCallback errorCallback) {
Common::JSONObject jsonRequestParameters;
jsonRequestParameters.setVal("path", new Common::JSONValue(path));
Common::JSONValue value(jsonRequestParameters);
@ -91,10 +91,10 @@ Networking::Request *DropboxStorage::streamFileById(Common::String path, Network
Networking::NetworkReadStreamResponse response = request->execute();
if (callback)
(*callback)(response);
return response.request; // no leak here, response.request == request
return request; // no leak here, response.request == request
}
Networking::Request *DropboxStorage::createDirectory(Common::String path, BoolCallback callback, Networking::ErrorCallback errorCallback) {
Networking::Request *DropboxStorage::createDirectory(const Common::String &path, BoolCallback callback, Networking::ErrorCallback errorCallback) {
if (!errorCallback)
errorCallback = getErrorPrintingCallback();
return addRequest(new DropboxCreateDirectoryRequest(this, path, callback, errorCallback));
@ -108,7 +108,7 @@ Networking::Request *DropboxStorage::info(StorageInfoCallback callback, Networki
Common::String DropboxStorage::savesDirectoryPath() { return "/saves/"; }
DropboxStorage *DropboxStorage::loadFromConfig(Common::String keyPrefix) {
DropboxStorage *DropboxStorage::loadFromConfig(const Common::String &keyPrefix) {
if (!ConfMan.hasKey(keyPrefix + "access_token", ConfMan.kCloudDomain)) {
warning("DropboxStorage: no access_token found");
return nullptr;
@ -124,7 +124,7 @@ DropboxStorage *DropboxStorage::loadFromConfig(Common::String keyPrefix) {
return new DropboxStorage(accessToken, refreshToken, loadIsEnabledFlag(keyPrefix));
}
void DropboxStorage::removeFromConfig(Common::String keyPrefix) {
void DropboxStorage::removeFromConfig(const Common::String &keyPrefix) {
ConfMan.removeKey(keyPrefix + "access_token", ConfMan.kCloudDomain);
ConfMan.removeKey(keyPrefix + "refresh_token", ConfMan.kCloudDomain);
removeIsEnabledFlag(keyPrefix);

36
backends/cloud/dropbox/dropboxstorage.h
View File

@ -31,31 +31,31 @@ namespace Dropbox {
class DropboxStorage: public Cloud::BaseStorage {
/** This private constructor is called from loadFromConfig(). */
DropboxStorage(Common::String token, Common::String refreshToken, bool enabled);
DropboxStorage(const Common::String &token, const Common::String &refreshToken, bool enabled);
protected:
/**
* @return "dropbox"
*/
virtual Common::String cloudProvider();
Common::String cloudProvider() override;
/**
* @return kStorageDropboxId
*/
virtual uint32 storageIndex();
uint32 storageIndex() override;
virtual bool needsRefreshToken();
bool needsRefreshToken() override;
virtual bool canReuseRefreshToken();
bool canReuseRefreshToken() override;
public:
/** This constructor uses OAuth code flow to get tokens. */
DropboxStorage(Common::String code, Networking::ErrorCallback cb);
DropboxStorage(const Common::String &code, Networking::ErrorCallback cb);
/** This constructor extracts tokens from JSON acquired via OAuth code flow. */
DropboxStorage(Networking::JsonResponse codeFlowJson, Networking::ErrorCallback cb);
DropboxStorage(const Networking::JsonResponse &codeFlowJson, Networking::ErrorCallback cb);
virtual ~DropboxStorage();
~DropboxStorage() override;
/**
* Storage methods, which are used by CloudManager to save
@ -68,44 +68,44 @@ public:
* @note every Storage must write keyPrefix + "type" key
* with common value (e.g. "Dropbox").
*/
virtual void saveConfig(Common::String keyPrefix);
void saveConfig(const Common::String &keyPrefix) override;
/**
* Return unique storage name.
* @returns some unique storage name (for example, "Dropbox (user@example.com)")
*/
virtual Common::String name() const;
Common::String name() const override;
/** Public Cloud API comes down there. */
/** Returns ListDirectoryStatus struct with list of files. */
virtual Networking::Request *listDirectory(Common::String path, ListDirectoryCallback callback, Networking::ErrorCallback errorCallback, bool recursive = false);
Networking::Request *listDirectory(const Common::String &path, ListDirectoryCallback callback, Networking::ErrorCallback errorCallback, bool recursive = false) override;
/** Returns UploadStatus struct with info about uploaded file. */
virtual Networking::Request *upload(Common::String path, Common::SeekableReadStream *contents, UploadCallback callback, Networking::ErrorCallback errorCallback);
Networking::Request *upload(const Common::String &path, Common::SeekableReadStream *contents, UploadCallback callback, Networking::ErrorCallback errorCallback) override;
/** Returns pointer to Networking::NetworkReadStream. */
virtual Networking::Request *streamFileById(Common::String path, Networking::NetworkReadStreamCallback callback, Networking::ErrorCallback errorCallback);
Networking::Request *streamFileById(const Common::String &path, Networking::NetworkReadStreamCallback callback, Networking::ErrorCallback errorCallback) override;
/** Calls the callback when finished. */
virtual Networking::Request *createDirectory(Common::String path, BoolCallback callback, Networking::ErrorCallback errorCallback);
Networking::Request *createDirectory(const Common::String &path, BoolCallback callback, Networking::ErrorCallback errorCallback) override;
/** Returns the StorageInfo struct. */
virtual Networking::Request *info(StorageInfoCallback callback, Networking::ErrorCallback errorCallback);
Networking::Request *info(StorageInfoCallback callback, Networking::ErrorCallback errorCallback) override;
/** Returns storage's saves directory path with the trailing slash. */
virtual Common::String savesDirectoryPath();
Common::String savesDirectoryPath() override;
/**
* Load token and user id from configs and return DropboxStorage for those.
* @return pointer to the newly created DropboxStorage or 0 if some problem occurred.
*/
static DropboxStorage *loadFromConfig(Common::String keyPrefix);
static DropboxStorage *loadFromConfig(const Common::String &keyPrefix);
/**
* Remove all DropboxStorage-related data from config.
*/
static void removeFromConfig(Common::String keyPrefix);
static void removeFromConfig(const Common::String &keyPrefix);
Common::String accessToken() const { return _token; }
};

14
backends/cloud/dropbox/dropboxtokenrefresher.cpp
View File

@ -36,7 +36,7 @@ DropboxTokenRefresher::DropboxTokenRefresher(DropboxStorage *parent, Networking:
DropboxTokenRefresher::~DropboxTokenRefresher() {}
void DropboxTokenRefresher::tokenRefreshed(Storage::BoolResponse response) {
void DropboxTokenRefresher::tokenRefreshed(const Storage::BoolResponse &response) {
if (!response.value) {
//failed to refresh token, notify user with NULL in original callback
warning("DropboxTokenRefresher: failed to refresh token");
@ -56,7 +56,7 @@ void DropboxTokenRefresher::tokenRefreshed(Storage::BoolResponse response) {
retry(0);
}
void DropboxTokenRefresher::finishJson(Common::JSONValue *json) {
void DropboxTokenRefresher::finishJson(const Common::JSONValue *json) {
if (!json) {
//that's probably not an error (200 OK)
CurlJsonRequest::finishJson(nullptr);
@ -88,7 +88,7 @@ void DropboxTokenRefresher::finishJson(Common::JSONValue *json) {
pause();
delete json;
_parentStorage->refreshAccessToken(new Common::Callback<DropboxTokenRefresher, Storage::BoolResponse>(this, &DropboxTokenRefresher::tokenRefreshed));
_parentStorage->refreshAccessToken(new Common::Callback<DropboxTokenRefresher, const Storage::BoolResponse &>(this, &DropboxTokenRefresher::tokenRefreshed));
return;
}
}
@ -97,17 +97,17 @@ void DropboxTokenRefresher::finishJson(Common::JSONValue *json) {
CurlJsonRequest::finishJson(json);
}
void DropboxTokenRefresher::finishError(Networking::ErrorResponse error, Networking::RequestState state) {
void DropboxTokenRefresher::finishError(const Networking::ErrorResponse &error, Networking::RequestState state) {
if (error.httpResponseCode == 401) {
pause();
_parentStorage->refreshAccessToken(new Common::Callback<DropboxTokenRefresher, Storage::BoolResponse>(this, &DropboxTokenRefresher::tokenRefreshed));
_parentStorage->refreshAccessToken(new Common::Callback<DropboxTokenRefresher, const Storage::BoolResponse &>(this, &DropboxTokenRefresher::tokenRefreshed));
return;
}
Request::finishError(error);
}
void DropboxTokenRefresher::setHeaders(Common::Array<Common::String> &headers) {
void DropboxTokenRefresher::setHeaders(const Common::Array<Common::String> &headers) {
_headers = headers;
curl_slist_free_all(_headersList);
_headersList = nullptr;
@ -115,7 +115,7 @@ void DropboxTokenRefresher::setHeaders(Common::Array<Common::String> &headers) {
CurlJsonRequest::addHeader(headers[i]);
}
void DropboxTokenRefresher::addHeader(Common::String header) {
void DropboxTokenRefresher::addHeader(const Common::String &header) {
_headers.push_back(header);
CurlJsonRequest::addHeader(header);
}

12
backends/cloud/dropbox/dropboxtokenrefresher.h
View File

@ -34,16 +34,16 @@ class DropboxTokenRefresher: public Networking::CurlJsonRequest {
DropboxStorage *_parentStorage;
Common::Array<Common::String> _headers;
void tokenRefreshed(Storage::BoolResponse response);
void tokenRefreshed(const Storage::BoolResponse &response);
virtual void finishJson(Common::JSONValue *json);
virtual void finishError(Networking::ErrorResponse error, Networking::RequestState state = Networking::FINISHED);
void finishJson(const Common::JSONValue *json) override;
void finishError(const Networking::ErrorResponse &error, Networking::RequestState state = Networking::FINISHED) override;
public:
DropboxTokenRefresher(DropboxStorage *parent, Networking::JsonCallback callback, Networking::ErrorCallback ecb, const char *url);
virtual ~DropboxTokenRefresher();
~DropboxTokenRefresher() override;
virtual void setHeaders(Common::Array<Common::String> &headers);
virtual void addHeader(Common::String header);
void setHeaders(const Common::Array<Common::String> &headers) override;
void addHeader(const Common::String &header) override;
};
} // End of namespace Dropbox

14
backends/cloud/dropbox/dropboxuploadrequest.cpp
View File

@ -35,7 +35,7 @@ namespace Dropbox {
#define DROPBOX_API_FILES_UPLOAD "https://content.dropboxapi.com/2/files/upload"
#define DROPBOX_API_FILES_UPLOAD_SESSION "https://content.dropboxapi.com/2/files/upload_session/"
DropboxUploadRequest::DropboxUploadRequest(DropboxStorage *storage, Common::String path, Common::SeekableReadStream *contents, Storage::UploadCallback callback, Networking::ErrorCallback ecb):
DropboxUploadRequest::DropboxUploadRequest(DropboxStorage *storage, const 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) {
start();
@ -108,8 +108,8 @@ void DropboxUploadRequest::uploadNextPart() {
}
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::JsonCallback callback = new Common::Callback<DropboxUploadRequest, const Networking::JsonResponse &>(this, &DropboxUploadRequest::partUploadedCallback);
Networking::ErrorCallback failureCallback = new Common::Callback<DropboxUploadRequest, const Networking::ErrorResponse &>(this, &DropboxUploadRequest::partUploadedErrorCallback);
Networking::CurlJsonRequest *request = new DropboxTokenRefresher(_storage, callback, failureCallback, url.c_str());
request->addHeader("Authorization: Bearer " + _storage->accessToken());
request->addHeader("Content-Type: application/octet-stream");
@ -122,17 +122,17 @@ void DropboxUploadRequest::uploadNextPart() {
_workingRequest = ConnMan.addRequest(request);
}
void DropboxUploadRequest::partUploadedCallback(Networking::JsonResponse response) {
void DropboxUploadRequest::partUploadedCallback(const Networking::JsonResponse &response) {
_workingRequest = nullptr;
if (_ignoreCallback)
return;
Networking::ErrorResponse error(this, false, true, "", -1);
Networking::CurlJsonRequest *rq = (Networking::CurlJsonRequest *)response.request;
const Networking::CurlJsonRequest *rq = (const Networking::CurlJsonRequest *)response.request;
if (rq && rq->getNetworkReadStream())
error.httpResponseCode = rq->getNetworkReadStream()->httpResponseCode();
Common::JSONValue *json = response.value;
const Common::JSONValue *json = response.value;
if (json == nullptr) {
error.response = "Failed to parse JSON, null passed!";
finishError(error);
@ -184,7 +184,7 @@ void DropboxUploadRequest::partUploadedCallback(Networking::JsonResponse respons
delete json;
}
void DropboxUploadRequest::partUploadedErrorCallback(Networking::ErrorResponse error) {
void DropboxUploadRequest::partUploadedErrorCallback(const Networking::ErrorResponse &error) {
_workingRequest = nullptr;
if (_ignoreCallback)
return;

12
backends/cloud/dropbox/dropboxuploadrequest.h
View File

@ -43,16 +43,16 @@ class DropboxUploadRequest: public Networking::Request {
void start();
void uploadNextPart();
void partUploadedCallback(Networking::JsonResponse response);
void partUploadedErrorCallback(Networking::ErrorResponse error);
void partUploadedCallback(const Networking::JsonResponse &response);
void partUploadedErrorCallback(const Networking::ErrorResponse &error);
void finishUpload(StorageFile status);
public:
DropboxUploadRequest(DropboxStorage *storage, Common::String path, Common::SeekableReadStream *contents, Storage::UploadCallback callback, Networking::ErrorCallback ecb);
virtual ~DropboxUploadRequest();
DropboxUploadRequest(DropboxStorage *storage, const Common::String &path, Common::SeekableReadStream *contents, Storage::UploadCallback callback, Networking::ErrorCallback ecb);
~DropboxUploadRequest() override;
virtual void handle();
virtual void restart();
void handle() override;
void restart() override;
};
} // End of namespace Dropbox

18
backends/cloud/folderdownloadrequest.cpp
View File

@ -29,7 +29,7 @@
namespace Cloud {
FolderDownloadRequest::FolderDownloadRequest(Storage *storage, Storage::FileArrayCallback callback, Networking::ErrorCallback ecb, Common::String remoteDirectoryPath, Common::String localDirectoryPath, bool recursive):
FolderDownloadRequest::FolderDownloadRequest(Storage *storage, Storage::FileArrayCallback callback, Networking::ErrorCallback ecb, const Common::String &remoteDirectoryPath, const Common::String &localDirectoryPath, bool recursive):
Request(nullptr, ecb), CommandSender(nullptr), _storage(storage), _fileArrayCallback(callback),
_remoteDirectoryPath(remoteDirectoryPath), _localDirectoryPath(localDirectoryPath), _recursive(recursive),
_workingRequest(nullptr), _ignoreCallback(false), _totalFiles(0) {
@ -59,13 +59,13 @@ void FolderDownloadRequest::start() {
//list directory first
_workingRequest = _storage->listDirectory(
_remoteDirectoryPath,
new Common::Callback<FolderDownloadRequest, Storage::ListDirectoryResponse>(this, &FolderDownloadRequest::directoryListedCallback),
new Common::Callback<FolderDownloadRequest, Networking::ErrorResponse>(this, &FolderDownloadRequest::directoryListedErrorCallback),
new Common::Callback<FolderDownloadRequest, const Storage::ListDirectoryResponse &>(this, &FolderDownloadRequest::directoryListedCallback),
new Common::Callback<FolderDownloadRequest, const Networking::ErrorResponse &>(this, &FolderDownloadRequest::directoryListedErrorCallback),
_recursive
);
}
void FolderDownloadRequest::directoryListedCallback(Storage::ListDirectoryResponse response) {
void FolderDownloadRequest::directoryListedCallback(const Storage::ListDirectoryResponse &response) {
_workingRequest = nullptr;
if (_ignoreCallback)
return;
@ -86,14 +86,14 @@ void FolderDownloadRequest::directoryListedCallback(Storage::ListDirectoryRespon
downloadNextFile();
}
void FolderDownloadRequest::directoryListedErrorCallback(Networking::ErrorResponse error) {
void FolderDownloadRequest::directoryListedErrorCallback(const Networking::ErrorResponse &error) {
_workingRequest = nullptr;
if (_ignoreCallback)
return;
finishError(error);
}
void FolderDownloadRequest::fileDownloadedCallback(Storage::BoolResponse response) {
void FolderDownloadRequest::fileDownloadedCallback(const Storage::BoolResponse &response) {
_workingRequest = nullptr;
if (_ignoreCallback)
return;
@ -102,7 +102,7 @@ void FolderDownloadRequest::fileDownloadedCallback(Storage::BoolResponse respons
downloadNextFile();
}
void FolderDownloadRequest::fileDownloadedErrorCallback(Networking::ErrorResponse error) {
void FolderDownloadRequest::fileDownloadedErrorCallback(const Networking::ErrorResponse &error) {
_workingRequest = nullptr;
if (_ignoreCallback)
return;
@ -143,8 +143,8 @@ void FolderDownloadRequest::downloadNextFile() {
debug(9, "FolderDownloadRequest: %s -> %s", remotePath.c_str(), localPath.c_str());
_workingRequest = _storage->downloadById(
_currentFile.id(), localPath,
new Common::Callback<FolderDownloadRequest, Storage::BoolResponse>(this, &FolderDownloadRequest::fileDownloadedCallback),
new Common::Callback<FolderDownloadRequest, Networking::ErrorResponse>(this, &FolderDownloadRequest::fileDownloadedErrorCallback)
new Common::Callback<FolderDownloadRequest, const Storage::BoolResponse &>(this, &FolderDownloadRequest::fileDownloadedCallback),
new Common::Callback<FolderDownloadRequest, const Networking::ErrorResponse &>(this, &FolderDownloadRequest::fileDownloadedErrorCallback)
);
}

16
backends/cloud/folderdownloadrequest.h
View File

@ -41,18 +41,18 @@ class FolderDownloadRequest: public Networking::Request, public GUI::CommandSend
uint64 _downloadedBytes, _totalBytes, _wasDownloadedBytes, _currentDownloadSpeed;
void start();
void directoryListedCallback(Storage::ListDirectoryResponse response);
void directoryListedErrorCallback(Networking::ErrorResponse error);
void fileDownloadedCallback(Storage::BoolResponse response);
void fileDownloadedErrorCallback(Networking::ErrorResponse error);
void directoryListedCallback(const Storage::ListDirectoryResponse &response);
void directoryListedErrorCallback(const Networking::ErrorResponse &error);
void fileDownloadedCallback(const Storage::BoolResponse &response);
void fileDownloadedErrorCallback(const Networking::ErrorResponse &error);
void downloadNextFile();
void finishDownload(Common::Array<StorageFile> &files);
public:
FolderDownloadRequest(Storage *storage, Storage::FileArrayCallback callback, Networking::ErrorCallback ecb, Common::String remoteDirectoryPath, Common::String localDirectoryPath, bool recursive);
virtual ~FolderDownloadRequest();
FolderDownloadRequest(Storage *storage, Storage::FileArrayCallback callback, Networking::ErrorCallback ecb, const Common::String &remoteDirectoryPath, const Common::String &localDirectoryPath, bool recursive);
~FolderDownloadRequest() override;
virtual void handle();
virtual void restart();
void handle() override;
void restart() override;
/** Returns a number in range [0, 1], where 1 is "complete". */
double getProgress() const;

16
backends/cloud/googledrive/googledrivelistdirectorybyidrequest.cpp
View File

@ -35,7 +35,7 @@ namespace GoogleDrive {
#define GOOGLEDRIVE_API_FILES "https://www.googleapis.com/drive/v3/files?spaces=drive&fields=files%28id,mimeType,modifiedTime,name,size%29,nextPageToken&orderBy=folder,name"
//files(id,mimeType,modifiedTime,name,size),nextPageToken
GoogleDriveListDirectoryByIdRequest::GoogleDriveListDirectoryByIdRequest(GoogleDriveStorage *storage, Common::String id, Storage::ListDirectoryCallback cb, Networking::ErrorCallback ecb):
GoogleDriveListDirectoryByIdRequest::GoogleDriveListDirectoryByIdRequest(GoogleDriveStorage *storage, const Common::String &id, Storage::ListDirectoryCallback cb, Networking::ErrorCallback ecb):
Networking::Request(nullptr, ecb), _requestedId(id), _storage(storage), _listDirectoryCallback(cb),
_workingRequest(nullptr), _ignoreCallback(false) {
start();
@ -58,20 +58,20 @@ void GoogleDriveListDirectoryByIdRequest::start() {
makeRequest("");
}
void GoogleDriveListDirectoryByIdRequest::makeRequest(Common::String pageToken) {
void GoogleDriveListDirectoryByIdRequest::makeRequest(const Common::String &pageToken) {
Common::String url = GOOGLEDRIVE_API_FILES;
if (pageToken != "")
url += "&pageToken=" + pageToken;
url += "&q=%27" + _requestedId + "%27+in+parents";
Networking::JsonCallback callback = new Common::Callback<GoogleDriveListDirectoryByIdRequest, Networking::JsonResponse>(this, &GoogleDriveListDirectoryByIdRequest::responseCallback);
Networking::ErrorCallback failureCallback = new Common::Callback<GoogleDriveListDirectoryByIdRequest, Networking::ErrorResponse>(this, &GoogleDriveListDirectoryByIdRequest::errorCallback);
Networking::JsonCallback callback = new Common::Callback<GoogleDriveListDirectoryByIdRequest, const Networking::JsonResponse &>(this, &GoogleDriveListDirectoryByIdRequest::responseCallback);
Networking::ErrorCallback failureCallback = new Common::Callback<GoogleDriveListDirectoryByIdRequest, const Networking::ErrorResponse &>(this, &GoogleDriveListDirectoryByIdRequest::errorCallback);
Networking::CurlJsonRequest *request = new GoogleDriveTokenRefresher(_storage, callback, failureCallback, url.c_str());
request->addHeader("Authorization: Bearer " + _storage->accessToken());
_workingRequest = ConnMan.addRequest(request);
}
void GoogleDriveListDirectoryByIdRequest::responseCallback(Networking::JsonResponse response) {
void GoogleDriveListDirectoryByIdRequest::responseCallback(const Networking::JsonResponse &response) {
_workingRequest = nullptr;
if (_ignoreCallback) {
delete response.value;
@ -81,11 +81,11 @@ void GoogleDriveListDirectoryByIdRequest::responseCallback(Networking::JsonRespo
_date = response.request->date();
Networking::ErrorResponse error(this, "GoogleDriveListDirectoryByIdRequest::responseCallback");
Networking::CurlJsonRequest *rq = (Networking::CurlJsonRequest *)response.request;
const Networking::CurlJsonRequest *rq = (const Networking::CurlJsonRequest *)response.request;
if (rq && rq->getNetworkReadStream())
error.httpResponseCode = rq->getNetworkReadStream()->httpResponseCode();
Common::JSONValue *json = response.value;
const Common::JSONValue *json = response.value;
if (json) {
Common::JSONObject responseObject = json->asObject();
@ -137,7 +137,7 @@ void GoogleDriveListDirectoryByIdRequest::responseCallback(Networking::JsonRespo
delete json;
}
void GoogleDriveListDirectoryByIdRequest::errorCallback(Networking::ErrorResponse error) {
void GoogleDriveListDirectoryByIdRequest::errorCallback(const Networking::ErrorResponse &error) {
_workingRequest = nullptr;
if (_ignoreCallback)
return;

16
backends/cloud/googledrive/googledrivelistdirectorybyidrequest.h
View File

@ -43,17 +43,17 @@ class GoogleDriveListDirectoryByIdRequest: public Networking::Request {
Common::String _date;
void start();
void makeRequest(Common::String pageToken);
void responseCallback(Networking::JsonResponse response);
void errorCallback(Networking::ErrorResponse error);
void makeRequest(const Common::String &pageToken);
void responseCallback(const Networking::JsonResponse &response);
void errorCallback(const Networking::ErrorResponse &error);
void finishListing(Common::Array<StorageFile> &files);
public:
GoogleDriveListDirectoryByIdRequest(GoogleDriveStorage *storage, Common::String id, Storage::ListDirectoryCallback cb, Networking::ErrorCallback ecb);
virtual ~GoogleDriveListDirectoryByIdRequest();
GoogleDriveListDirectoryByIdRequest(GoogleDriveStorage *storage, const Common::String &id, Storage::ListDirectoryCallback cb, Networking::ErrorCallback ecb);
~GoogleDriveListDirectoryByIdRequest() override;
virtual void handle();
virtual void restart();
virtual Common::String date() const;
void handle() override;
void restart() override;
Common::String date() const override;
};
} // End of namespace GoogleDrive

38
backends/cloud/googledrive/googledrivestorage.cpp
View File

@ -42,14 +42,14 @@ namespace GoogleDrive {
#define GOOGLEDRIVE_API_FILES "https://www.googleapis.com/drive/v3/files"
#define GOOGLEDRIVE_API_ABOUT "https://www.googleapis.com/drive/v3/about?fields=storageQuota,user"
GoogleDriveStorage::GoogleDriveStorage(Common::String token, Common::String refreshToken, bool enabled):
GoogleDriveStorage::GoogleDriveStorage(const Common::String &token, const Common::String &refreshToken, bool enabled):
IdStorage(token, refreshToken, enabled) {}
GoogleDriveStorage::GoogleDriveStorage(Common::String code, Networking::ErrorCallback cb) {
GoogleDriveStorage::GoogleDriveStorage(const Common::String &code, Networking::ErrorCallback cb) {
getAccessToken(code, cb);
}
GoogleDriveStorage::GoogleDriveStorage(Networking::JsonResponse codeFlowJson, Networking::ErrorCallback cb) {
GoogleDriveStorage::GoogleDriveStorage(const Networking::JsonResponse &codeFlowJson, Networking::ErrorCallback cb) {
codeFlowComplete(cb, codeFlowJson);
}
@ -63,7 +63,7 @@ bool GoogleDriveStorage::needsRefreshToken() { return true; }
bool GoogleDriveStorage::canReuseRefreshToken() { return true; }
void GoogleDriveStorage::saveConfig(Common::String keyPrefix) {
void GoogleDriveStorage::saveConfig(const Common::String &keyPrefix) {
ConfMan.set(keyPrefix + "access_token", _token, ConfMan.kCloudDomain);
ConfMan.set(keyPrefix + "refresh_token", _refreshToken, ConfMan.kCloudDomain);
saveIsEnabledFlag(keyPrefix);
@ -73,8 +73,8 @@ Common::String GoogleDriveStorage::name() const {
return "Google Drive";
}
void GoogleDriveStorage::infoInnerCallback(StorageInfoCallback outerCallback, Networking::JsonResponse response) {
Common::JSONValue *json = response.value;
void GoogleDriveStorage::infoInnerCallback(StorageInfoCallback outerCallback, const Networking::JsonResponse &response) {
const Common::JSONValue *json = response.value;
if (!json) {
warning("GoogleDriveStorage::infoInnerCallback: NULL passed instead of JSON");
delete outerCallback;
@ -131,8 +131,8 @@ void GoogleDriveStorage::infoInnerCallback(StorageInfoCallback outerCallback, Ne
delete json;
}
void GoogleDriveStorage::createDirectoryInnerCallback(BoolCallback outerCallback, Networking::JsonResponse response) {
Common::JSONValue *json = response.value;
void GoogleDriveStorage::createDirectoryInnerCallback(BoolCallback outerCallback, const Networking::JsonResponse &response) {
const Common::JSONValue *json = response.value;
if (!json) {
warning("GoogleDriveStorage::createDirectoryInnerCallback: NULL passed instead of JSON");
delete outerCallback;
@ -152,19 +152,19 @@ void GoogleDriveStorage::createDirectoryInnerCallback(BoolCallback outerCallback
delete json;
}
Networking::Request *GoogleDriveStorage::listDirectoryById(Common::String id, ListDirectoryCallback callback, Networking::ErrorCallback errorCallback) {
Networking::Request *GoogleDriveStorage::listDirectoryById(const Common::String &id, ListDirectoryCallback callback, Networking::ErrorCallback errorCallback) {
if (!errorCallback)
errorCallback = getErrorPrintingCallback();
if (!callback)
callback = new Common::Callback<GoogleDriveStorage, FileArrayResponse>(this, &GoogleDriveStorage::printFiles);
callback = new Common::Callback<GoogleDriveStorage, const FileArrayResponse &>(this, &GoogleDriveStorage::printFiles);
return addRequest(new GoogleDriveListDirectoryByIdRequest(this, id, callback, errorCallback));
}
Networking::Request *GoogleDriveStorage::upload(Common::String path, Common::SeekableReadStream *contents, UploadCallback callback, Networking::ErrorCallback errorCallback) {
Networking::Request *GoogleDriveStorage::upload(const Common::String &path, Common::SeekableReadStream *contents, UploadCallback callback, Networking::ErrorCallback errorCallback) {
return addRequest(new GoogleDriveUploadRequest(this, path, contents, callback, errorCallback));
}
Networking::Request *GoogleDriveStorage::streamFileById(Common::String id, Networking::NetworkReadStreamCallback callback, Networking::ErrorCallback errorCallback) {
Networking::Request *GoogleDriveStorage::streamFileById(const Common::String &id, Networking::NetworkReadStreamCallback callback, Networking::ErrorCallback errorCallback) {
if (callback) {
Common::String url = Common::String::format(GOOGLEDRIVE_API_FILES_ALT_MEDIA, ConnMan.urlEncode(id).c_str());
Common::String header = "Authorization: Bearer " + _token;
@ -177,7 +177,7 @@ Networking::Request *GoogleDriveStorage::streamFileById(Common::String id, Netwo
return nullptr;
}
void GoogleDriveStorage::printInfo(StorageInfoResponse response) {
void GoogleDriveStorage::printInfo(const StorageInfoResponse &response) {
debug(9, "\nGoogleDriveStorage: user info:");
debug(9, "\tname: %s", response.value.name().c_str());
debug(9, "\temail: %s", response.value.email().c_str());
@ -186,12 +186,12 @@ void GoogleDriveStorage::printInfo(StorageInfoResponse response) {
(unsigned long long)response.value.available());
}
Networking::Request *GoogleDriveStorage::createDirectoryWithParentId(Common::String parentId, Common::String directoryName, BoolCallback callback, Networking::ErrorCallback errorCallback) {
Networking::Request *GoogleDriveStorage::createDirectoryWithParentId(const Common::String &parentId, const Common::String &directoryName, BoolCallback callback, Networking::ErrorCallback errorCallback) {
if (!errorCallback)
errorCallback = getErrorPrintingCallback();
Common::String url = GOOGLEDRIVE_API_FILES;
Networking::JsonCallback innerCallback = new Common::CallbackBridge<GoogleDriveStorage, BoolResponse, Networking::JsonResponse>(this, &GoogleDriveStorage::createDirectoryInnerCallback, callback);
Networking::JsonCallback innerCallback = new Common::CallbackBridge<GoogleDriveStorage, const BoolResponse &, const Networking::JsonResponse &>(this, &GoogleDriveStorage::createDirectoryInnerCallback, callback);
Networking::CurlJsonRequest *request = new GoogleDriveTokenRefresher(this, innerCallback, errorCallback, url.c_str());
request->addHeader("Authorization: Bearer " + accessToken());
request->addHeader("Content-Type: application/json");
@ -212,8 +212,8 @@ Networking::Request *GoogleDriveStorage::createDirectoryWithParentId(Common::Str
Networking::Request *GoogleDriveStorage::info(StorageInfoCallback callback, Networking::ErrorCallback errorCallback) {
if (!callback)
callback = new Common::Callback<GoogleDriveStorage, StorageInfoResponse>(this, &GoogleDriveStorage::printInfo);
Networking::JsonCallback innerCallback = new Common::CallbackBridge<GoogleDriveStorage, StorageInfoResponse, Networking::JsonResponse>(this, &GoogleDriveStorage::infoInnerCallback, callback);
callback = new Common::Callback<GoogleDriveStorage, const StorageInfoResponse &>(this, &GoogleDriveStorage::printInfo);
Networking::JsonCallback innerCallback = new Common::CallbackBridge<GoogleDriveStorage, const StorageInfoResponse &, const Networking::JsonResponse &>(this, &GoogleDriveStorage::infoInnerCallback, callback);
Networking::CurlJsonRequest *request = new GoogleDriveTokenRefresher(this, innerCallback, errorCallback, GOOGLEDRIVE_API_ABOUT);
request->addHeader("Authorization: Bearer " + _token);
return addRequest(request);
@ -221,7 +221,7 @@ Networking::Request *GoogleDriveStorage::info(StorageInfoCallback callback, Netw
Common::String GoogleDriveStorage::savesDirectoryPath() { return "scummvm/saves/"; }
GoogleDriveStorage *GoogleDriveStorage::loadFromConfig(Common::String keyPrefix) {
GoogleDriveStorage *GoogleDriveStorage::loadFromConfig(const Common::String &keyPrefix) {
if (!ConfMan.hasKey(keyPrefix + "access_token", ConfMan.kCloudDomain)) {
warning("GoogleDriveStorage: no access_token found");
return nullptr;
@ -237,7 +237,7 @@ GoogleDriveStorage *GoogleDriveStorage::loadFromConfig(Common::String keyPrefix)
return new GoogleDriveStorage(accessToken, refreshToken, loadIsEnabledFlag(keyPrefix));
}
void GoogleDriveStorage::removeFromConfig(Common::String keyPrefix) {
void GoogleDriveStorage::removeFromConfig(const Common::String &keyPrefix) {
ConfMan.removeKey(keyPrefix + "access_token", ConfMan.kCloudDomain);
ConfMan.removeKey(keyPrefix + "refresh_token", ConfMan.kCloudDomain);
removeIsEnabledFlag(keyPrefix);

44
backends/cloud/googledrive/googledrivestorage.h
View File

@ -30,39 +30,39 @@ namespace GoogleDrive {
class GoogleDriveStorage: public Id::IdStorage {
/** This private constructor is called from loadFromConfig(). */
GoogleDriveStorage(Common::String token, Common::String refreshToken, bool enabled);
GoogleDriveStorage(const Common::String &token, const Common::String &refreshToken, bool enabled);
/** Constructs StorageInfo based on JSON response from cloud. */
void infoInnerCallback(StorageInfoCallback outerCallback, Networking::JsonResponse json);
void infoInnerCallback(StorageInfoCallback outerCallback, const Networking::JsonResponse &json);
/** Returns bool based on JSON response from cloud. */
void createDirectoryInnerCallback(BoolCallback outerCallback, Networking::JsonResponse json);
void createDirectoryInnerCallback(BoolCallback outerCallback, const Networking::JsonResponse &json);
void printInfo(StorageInfoResponse response);
void printInfo(const StorageInfoResponse &response);
protected:
/**
* @return "gdrive"
*/
virtual Common::String cloudProvider();
Common::String cloudProvider() override;
/**
* @return kStorageGoogleDriveId
*/
virtual uint32 storageIndex();
uint32 storageIndex() override;
virtual bool needsRefreshToken();
bool needsRefreshToken() override;
virtual bool canReuseRefreshToken();
bool canReuseRefreshToken() override;
public:
/** This constructor uses OAuth code flow to get tokens. */
GoogleDriveStorage(Common::String code, Networking::ErrorCallback cb);
GoogleDriveStorage(const Common::String &code, Networking::ErrorCallback cb);
/** This constructor extracts tokens from JSON acquired via OAuth code flow. */
GoogleDriveStorage(Networking::JsonResponse codeFlowJson, Networking::ErrorCallback cb);
GoogleDriveStorage(const Networking::JsonResponse &codeFlowJson, Networking::ErrorCallback cb);
virtual ~GoogleDriveStorage();
~GoogleDriveStorage() override;
/**
* Storage methods, which are used by CloudManager to save
@ -75,46 +75,46 @@ public:
* @note every Storage must write keyPrefix + "type" key
* with common value (e.g. "Dropbox").
*/
virtual void saveConfig(Common::String keyPrefix);
void saveConfig(const Common::String &keyPrefix) override;
/**
* Return unique storage name.
* @returns some unique storage name (for example, "Dropbox (user@example.com)")
*/
virtual Common::String name() const;
Common::String name() const override;
/** Public Cloud API comes down there. */
/** Returns Array<StorageFile> - the list of files. */
virtual Networking::Request *listDirectoryById(Common::String id, ListDirectoryCallback callback, Networking::ErrorCallback errorCallback);
Networking::Request *listDirectoryById(const Common::String &id, ListDirectoryCallback callback, Networking::ErrorCallback errorCallback) override;
/** Returns UploadStatus struct with info about uploaded file. */
virtual Networking::Request *upload(Common::String path, Common::SeekableReadStream *contents, UploadCallback callback, Networking::ErrorCallback errorCallback);
Networking::Request *upload(const Common::String &path, Common::SeekableReadStream *contents, UploadCallback callback, Networking::ErrorCallback errorCallback) override;
/** Returns pointer to Networking::NetworkReadStream. */
virtual Networking::Request *streamFileById(Common::String id, Networking::NetworkReadStreamCallback callback, Networking::ErrorCallback errorCallback);
Networking::Request *streamFileById(const Common::String &id, Networking::NetworkReadStreamCallback callback, Networking::ErrorCallback errorCallback) override;
/** Calls the callback when finished. */
virtual Networking::Request *createDirectoryWithParentId(Common::String parentId, Common::String directoryName, BoolCallback callback, Networking::ErrorCallback errorCallback);
Networking::Request *createDirectoryWithParentId(const Common::String &parentId, const Common::String &directoryName, BoolCallback callback, Networking::ErrorCallback errorCallback) override;
/** Returns the StorageInfo struct. */
virtual Networking::Request *info(StorageInfoCallback callback, Networking::ErrorCallback errorCallback);
Networking::Request *info(StorageInfoCallback callback, Networking::ErrorCallback errorCallback) override;
/** Returns storage's saves directory path with the trailing slash. */
virtual Common::String savesDirectoryPath();
Common::String savesDirectoryPath() override;
/**
* Load token and user id from configs and return GoogleDriveStorage for those.
* @return pointer to the newly created GoogleDriveStorage or 0 if some problem occurred.
*/
static GoogleDriveStorage *loadFromConfig(Common::String keyPrefix);
static GoogleDriveStorage *loadFromConfig(const Common::String &keyPrefix);
/**
* Remove all GoogleDriveStorage-related data from config.
*/
static void removeFromConfig(Common::String keyPrefix);
static void removeFromConfig(const Common::String &keyPrefix);
virtual Common::String getRootDirectoryId();
Common::String getRootDirectoryId() override;
Common::String accessToken() const { return _token; }
};

10
backends/cloud/googledrive/googledrivetokenrefresher.cpp
View File

@ -36,7 +36,7 @@ GoogleDriveTokenRefresher::GoogleDriveTokenRefresher(GoogleDriveStorage *parent,
GoogleDriveTokenRefresher::~GoogleDriveTokenRefresher() {}
void GoogleDriveTokenRefresher::tokenRefreshed(Storage::BoolResponse response) {
void GoogleDriveTokenRefresher::tokenRefreshed(const Storage::BoolResponse &response) {
if (!response.value) {
//failed to refresh token, notify user with NULL in original callback
warning("GoogleDriveTokenRefresher: failed to refresh token");
@ -56,7 +56,7 @@ void GoogleDriveTokenRefresher::tokenRefreshed(Storage::BoolResponse response) {
retry(0);
}
void GoogleDriveTokenRefresher::finishJson(Common::JSONValue *json) {
void GoogleDriveTokenRefresher::finishJson(const Common::JSONValue *json) {
if (!json) {
//that's probably not an error (200 OK)
CurlJsonRequest::finishJson(nullptr);
@ -99,7 +99,7 @@ void GoogleDriveTokenRefresher::finishJson(Common::JSONValue *json) {
pause();
delete json;
_parentStorage->refreshAccessToken(new Common::Callback<GoogleDriveTokenRefresher, Storage::BoolResponse>(this, &GoogleDriveTokenRefresher::tokenRefreshed));
_parentStorage->refreshAccessToken(new Common::Callback<GoogleDriveTokenRefresher, const Storage::BoolResponse &>(this, &GoogleDriveTokenRefresher::tokenRefreshed));
return;
}
}
@ -108,7 +108,7 @@ void GoogleDriveTokenRefresher::finishJson(Common::JSONValue *json) {
CurlJsonRequest::finishJson(json);
}
void GoogleDriveTokenRefresher::setHeaders(Common::Array<Common::String> &headers) {
void GoogleDriveTokenRefresher::setHeaders(const Common::Array<Common::String> &headers) {
_headers = headers;
curl_slist_free_all(_headersList);
_headersList = nullptr;
@ -116,7 +116,7 @@ void GoogleDriveTokenRefresher::setHeaders(Common::Array<Common::String> &header
CurlJsonRequest::addHeader(headers[i]);
}
void GoogleDriveTokenRefresher::addHeader(Common::String header) {
void GoogleDriveTokenRefresher::addHeader(const Common::String &header) {
_headers.push_back(header);
CurlJsonRequest::addHeader(header);
}

10
backends/cloud/googledrive/googledrivetokenrefresher.h
View File

@ -34,15 +34,15 @@ class GoogleDriveTokenRefresher: public Networking::CurlJsonRequest {
GoogleDriveStorage *_parentStorage;
Common::Array<Common::String> _headers;
void tokenRefreshed(Storage::BoolResponse response);
void tokenRefreshed(const Storage::BoolResponse &response);
virtual void finishJson(Common::JSONValue *json);
void finishJson(const Common::JSONValue *json) override;
public:
GoogleDriveTokenRefresher(GoogleDriveStorage *parent, Networking::JsonCallback callback, Networking::ErrorCallback ecb, const char *url);
virtual ~GoogleDriveTokenRefresher();
~GoogleDriveTokenRefresher() override;
virtual void setHeaders(Common::Array<Common::String> &headers);
virtual void addHeader(Common::String header);
void setHeaders(const Common::Array<Common::String> &headers) override;
void addHeader(const Common::String &header) override;
};
} // End of namespace GoogleDrive

36
backends/cloud/googledrive/googledriveuploadrequest.cpp
View File

@ -34,7 +34,7 @@ namespace GoogleDrive {
#define GOOGLEDRIVE_API_FILES "https://www.googleapis.com/upload/drive/v3/files"
GoogleDriveUploadRequest::GoogleDriveUploadRequest(GoogleDriveStorage *storage, Common::String path, Common::SeekableReadStream *contents, Storage::UploadCallback callback, Networking::ErrorCallback ecb):
GoogleDriveUploadRequest::GoogleDriveUploadRequest(GoogleDriveStorage *storage, const 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) {
start();
@ -67,12 +67,12 @@ void GoogleDriveUploadRequest::start() {
void GoogleDriveUploadRequest::resolveId() {
//check whether such file already exists
Storage::UploadCallback innerCallback = new Common::Callback<GoogleDriveUploadRequest, Storage::UploadResponse>(this, &GoogleDriveUploadRequest::idResolvedCallback);
Networking::ErrorCallback innerErrorCallback = new Common::Callback<GoogleDriveUploadRequest, Networking::ErrorResponse>(this, &GoogleDriveUploadRequest::idResolveFailedCallback);
Storage::UploadCallback innerCallback = new Common::Callback<GoogleDriveUploadRequest, const Storage::UploadResponse &>(this, &GoogleDriveUploadRequest::idResolvedCallback);
Networking::ErrorCallback innerErrorCallback = new Common::Callback<GoogleDriveUploadRequest, const Networking::ErrorResponse &>(this, &GoogleDriveUploadRequest::idResolveFailedCallback);
_workingRequest = _storage->resolveFileId(_savePath, innerCallback, innerErrorCallback);
}
void GoogleDriveUploadRequest::idResolvedCallback(Storage::UploadResponse response) {
void GoogleDriveUploadRequest::idResolvedCallback(const Storage::UploadResponse &response) {
_workingRequest = nullptr;
if (_ignoreCallback)
return;
@ -80,7 +80,7 @@ void GoogleDriveUploadRequest::idResolvedCallback(Storage::UploadResponse respon
startUpload();
}
void GoogleDriveUploadRequest::idResolveFailedCallback(Networking::ErrorResponse error) {
void GoogleDriveUploadRequest::idResolveFailedCallback(const Networking::ErrorResponse &error) {
_workingRequest = nullptr;
if (_ignoreCallback)
return;
@ -116,8 +116,8 @@ void GoogleDriveUploadRequest::startUpload() {
if (_resolvedId != "")
url += "/" + ConnMan.urlEncode(_resolvedId);
url += "?uploadType=resumable&fields=id,mimeType,modifiedTime,name,size";
Networking::JsonCallback callback = new Common::Callback<GoogleDriveUploadRequest, Networking::JsonResponse>(this, &GoogleDriveUploadRequest::startUploadCallback);
Networking::ErrorCallback failureCallback = new Common::Callback<GoogleDriveUploadRequest, Networking::ErrorResponse>(this, &GoogleDriveUploadRequest::startUploadErrorCallback);
Networking::JsonCallback callback = new Common::Callback<GoogleDriveUploadRequest, const Networking::JsonResponse &>(this, &GoogleDriveUploadRequest::startUploadCallback);
Networking::ErrorCallback failureCallback = new Common::Callback<GoogleDriveUploadRequest, const Networking::ErrorResponse &>(this, &GoogleDriveUploadRequest::startUploadErrorCallback);
Networking::CurlJsonRequest *request = new GoogleDriveTokenRefresher(_storage, callback, failureCallback, url.c_str());
request->addHeader("Authorization: Bearer " + _storage->accessToken());
request->addHeader("Content-Type: application/json");
@ -140,13 +140,13 @@ void GoogleDriveUploadRequest::startUpload() {
_workingRequest = ConnMan.addRequest(request);
}
void GoogleDriveUploadRequest::startUploadCallback(Networking::JsonResponse response) {
void GoogleDriveUploadRequest::startUploadCallback(const Networking::JsonResponse &response) {
_workingRequest = nullptr;
if (_ignoreCallback)
return;
Networking::ErrorResponse error(this, false, true, "GoogleDriveUploadRequest::startUploadCallback", -1);
Networking::CurlJsonRequest *rq = (Networking::CurlJsonRequest *)response.request;
const Networking::CurlJsonRequest *rq = (const Networking::CurlJsonRequest *)response.request;
if (rq) {
const Networking::NetworkReadStream *stream = rq->getNetworkReadStream();
if (stream) {
@ -172,13 +172,13 @@ void GoogleDriveUploadRequest::startUploadCallback(Networking::JsonResponse resp
error.response += ": missing request object [improbable]";
}
Common::JSONValue *json = response.value;
const Common::JSONValue *json = response.value;
delete json;
finishError(error);
}
void GoogleDriveUploadRequest::startUploadErrorCallback(Networking::ErrorResponse error) {
void GoogleDriveUploadRequest::startUploadErrorCallback(const Networking::ErrorResponse &error) {
_workingRequest = nullptr;
if (_ignoreCallback)
return;
@ -189,8 +189,8 @@ 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::JsonCallback callback = new Common::Callback<GoogleDriveUploadRequest, const Networking::JsonResponse &>(this, &GoogleDriveUploadRequest::partUploadedCallback);
Networking::ErrorCallback failureCallback = new Common::Callback<GoogleDriveUploadRequest, const Networking::ErrorResponse &>(this, &GoogleDriveUploadRequest::partUploadedErrorCallback);
Networking::CurlJsonRequest *request = new GoogleDriveTokenRefresher(_storage, callback, failureCallback, url.c_str());
request->addHeader("Authorization: Bearer " + _storage->accessToken());
request->usePut();
@ -246,26 +246,26 @@ bool GoogleDriveUploadRequest::handleHttp308(const Networking::NetworkReadStream
return false;
}
void GoogleDriveUploadRequest::partUploadedCallback(Networking::JsonResponse response) {
void GoogleDriveUploadRequest::partUploadedCallback(const Networking::JsonResponse &response) {
_workingRequest = nullptr;
if (_ignoreCallback)
return;
Networking::ErrorResponse error(this, false, true, "", -1);
Networking::CurlJsonRequest *rq = (Networking::CurlJsonRequest *)response.request;
const Networking::CurlJsonRequest *rq = (const Networking::CurlJsonRequest *)response.request;
if (rq) {
const Networking::NetworkReadStream *stream = rq->getNetworkReadStream();
if (stream) {
long code = stream->httpResponseCode();
error.httpResponseCode = code;
if (code == 308 && handleHttp308(stream)) {
delete (Common::JSONValue *)response.value;
delete response.value;
return;
}
}
}
Common::JSONValue *json = response.value;
const Common::JSONValue *json = response.value;
if (json == nullptr) {
error.response = "Failed to parse JSON, null passed!";
finishError(error);
@ -311,7 +311,7 @@ void GoogleDriveUploadRequest::partUploadedCallback(Networking::JsonResponse res
delete json;
}
void GoogleDriveUploadRequest::partUploadedErrorCallback(Networking::ErrorResponse error) {
void GoogleDriveUploadRequest::partUploadedErrorCallback(const Networking::ErrorResponse &error) {
_workingRequest = nullptr;
if (_ignoreCallback)
return;

20
backends/cloud/googledrive/googledriveuploadrequest.h
View File

@ -44,23 +44,23 @@ class GoogleDriveUploadRequest: public Networking::Request {
void start();
void resolveId();
void idResolvedCallback(Storage::UploadResponse response);
void idResolveFailedCallback(Networking::ErrorResponse error);
void idResolvedCallback(const Storage::UploadResponse &response);
void idResolveFailedCallback(const Networking::ErrorResponse &error);
void startUpload();
void startUploadCallback(Networking::JsonResponse response);
void startUploadErrorCallback(Networking::ErrorResponse error);
void startUploadCallback(const Networking::JsonResponse &response);
void startUploadErrorCallback(const Networking::ErrorResponse &error);
void uploadNextPart();
void partUploadedCallback(Networking::JsonResponse response);
void partUploadedErrorCallback(Networking::ErrorResponse error);
void partUploadedCallback(const Networking::JsonResponse &response);
void partUploadedErrorCallback(const Networking::ErrorResponse &error);
bool handleHttp308(const Networking::NetworkReadStream *stream);
void finishUpload(StorageFile status);
public:
GoogleDriveUploadRequest(GoogleDriveStorage *storage, Common::String path, Common::SeekableReadStream *contents, Storage::UploadCallback callback, Networking::ErrorCallback ecb);
virtual ~GoogleDriveUploadRequest();
GoogleDriveUploadRequest(GoogleDriveStorage *storage, const Common::String &path, Common::SeekableReadStream *contents, Storage::UploadCallback callback, Networking::ErrorCallback ecb);
~GoogleDriveUploadRequest() override;
virtual void handle();
virtual void restart();
void handle() override;
void restart() override;
};
} // End of namespace GoogleDrive

26
backends/cloud/id/idcreatedirectoryrequest.cpp
View File

@ -26,7 +26,7 @@
namespace Cloud {
namespace Id {
IdCreateDirectoryRequest::IdCreateDirectoryRequest(IdStorage *storage, Common::String parentPath, Common::String directoryName, Storage::BoolCallback cb, Networking::ErrorCallback ecb):
IdCreateDirectoryRequest::IdCreateDirectoryRequest(IdStorage *storage, const Common::String &parentPath, const Common::String &directoryName, Storage::BoolCallback cb, Networking::ErrorCallback ecb):
Networking::Request(nullptr, ecb),
_requestedParentPath(parentPath), _requestedDirectoryName(directoryName), _storage(storage), _boolCallback(cb),
_workingRequest(nullptr), _ignoreCallback(false) {
@ -53,8 +53,8 @@ void IdCreateDirectoryRequest::start() {
if (prefix.size() > 7)
prefix.erase(7);
if (prefix.equalsIgnoreCase("ScummVM")) {
Storage::BoolCallback callback = new Common::Callback<IdCreateDirectoryRequest, Storage::BoolResponse>(this, &IdCreateDirectoryRequest::createdBaseDirectoryCallback);
Networking::ErrorCallback failureCallback = new Common::Callback<IdCreateDirectoryRequest, Networking::ErrorResponse>(this, &IdCreateDirectoryRequest::createdBaseDirectoryErrorCallback);
Storage::BoolCallback callback = new Common::Callback<IdCreateDirectoryRequest, const Storage::BoolResponse &>(this, &IdCreateDirectoryRequest::createdBaseDirectoryCallback);
Networking::ErrorCallback failureCallback = new Common::Callback<IdCreateDirectoryRequest, const Networking::ErrorResponse &>(this, &IdCreateDirectoryRequest::createdBaseDirectoryErrorCallback);
_workingRequest = _storage->createDirectory("ScummVM", callback, failureCallback);
return;
}
@ -62,7 +62,7 @@ void IdCreateDirectoryRequest::start() {
resolveId();
}
void IdCreateDirectoryRequest::createdBaseDirectoryCallback(Storage::BoolResponse response) {
void IdCreateDirectoryRequest::createdBaseDirectoryCallback(const Storage::BoolResponse &response) {
_workingRequest = nullptr;
if (_ignoreCallback)
return;
@ -71,7 +71,7 @@ void IdCreateDirectoryRequest::createdBaseDirectoryCallback(Storage::BoolRespons
resolveId();
}
void IdCreateDirectoryRequest::createdBaseDirectoryErrorCallback(Networking::ErrorResponse error) {
void IdCreateDirectoryRequest::createdBaseDirectoryErrorCallback(const Networking::ErrorResponse &error) {
_workingRequest = nullptr;
if (_ignoreCallback)
return;
@ -82,8 +82,8 @@ void IdCreateDirectoryRequest::createdBaseDirectoryErrorCallback(Networking::Err
void IdCreateDirectoryRequest::resolveId() {
//check whether such folder already exists
Storage::UploadCallback innerCallback = new Common::Callback<IdCreateDirectoryRequest, Storage::UploadResponse>(this, &IdCreateDirectoryRequest::idResolvedCallback);
Networking::ErrorCallback innerErrorCallback = new Common::Callback<IdCreateDirectoryRequest, Networking::ErrorResponse>(this, &IdCreateDirectoryRequest::idResolveFailedCallback);
Storage::UploadCallback innerCallback = new Common::Callback<IdCreateDirectoryRequest, const Storage::UploadResponse &>(this, &IdCreateDirectoryRequest::idResolvedCallback);
Networking::ErrorCallback innerErrorCallback = new Common::Callback<IdCreateDirectoryRequest, const Networking::ErrorResponse &>(this, &IdCreateDirectoryRequest::idResolveFailedCallback);
Common::String path = _requestedParentPath;
if (_requestedParentPath != "")
path += "/";
@ -91,7 +91,7 @@ void IdCreateDirectoryRequest::resolveId() {
_workingRequest = _storage->resolveFileId(path, innerCallback, innerErrorCallback);
}
void IdCreateDirectoryRequest::idResolvedCallback(Storage::UploadResponse response) {
void IdCreateDirectoryRequest::idResolvedCallback(const Storage::UploadResponse &response) {
_workingRequest = nullptr;
if (_ignoreCallback)
return;
@ -102,7 +102,7 @@ void IdCreateDirectoryRequest::idResolvedCallback(Storage::UploadResponse respon
finishCreation(false);
}
void IdCreateDirectoryRequest::idResolveFailedCallback(Networking::ErrorResponse error) {
void IdCreateDirectoryRequest::idResolveFailedCallback(const Networking::ErrorResponse &error) {
_workingRequest = nullptr;
if (_ignoreCallback)
return;
@ -119,8 +119,8 @@ void IdCreateDirectoryRequest::idResolveFailedCallback(Networking::ErrorResponse
break;
}
Storage::BoolCallback callback = new Common::Callback<IdCreateDirectoryRequest, Storage::BoolResponse>(this, &IdCreateDirectoryRequest::createdDirectoryCallback);
Networking::ErrorCallback failureCallback = new Common::Callback<IdCreateDirectoryRequest, Networking::ErrorResponse>(this, &IdCreateDirectoryRequest::createdDirectoryErrorCallback);
Storage::BoolCallback callback = new Common::Callback<IdCreateDirectoryRequest, const Storage::BoolResponse &>(this, &IdCreateDirectoryRequest::createdDirectoryCallback);
Networking::ErrorCallback failureCallback = new Common::Callback<IdCreateDirectoryRequest, const Networking::ErrorResponse &>(this, &IdCreateDirectoryRequest::createdDirectoryErrorCallback);
_workingRequest = _storage->createDirectoryWithParentId(parentId, _requestedDirectoryName, callback, failureCallback);
return;
}
@ -128,7 +128,7 @@ void IdCreateDirectoryRequest::idResolveFailedCallback(Networking::ErrorResponse
finishError(error);
}
void IdCreateDirectoryRequest::createdDirectoryCallback(Storage::BoolResponse response) {
void IdCreateDirectoryRequest::createdDirectoryCallback(const Storage::BoolResponse &response) {
_workingRequest = nullptr;
if (_ignoreCallback)
return;
@ -137,7 +137,7 @@ void IdCreateDirectoryRequest::createdDirectoryCallback(Storage::BoolResponse re
finishCreation(response.value);
}
void IdCreateDirectoryRequest::createdDirectoryErrorCallback(Networking::ErrorResponse error) {
void IdCreateDirectoryRequest::createdDirectoryErrorCallback(const Networking::ErrorResponse &error) {
_workingRequest = nullptr;
if (_ignoreCallback)
return;

22
backends/cloud/id/idcreatedirectoryrequest.h
View File

@ -41,21 +41,21 @@ class IdCreateDirectoryRequest: public Networking::Request {
Common::String _date;
void start();
void createdBaseDirectoryCallback(Storage::BoolResponse response);
void createdBaseDirectoryErrorCallback(Networking::ErrorResponse error);
void createdBaseDirectoryCallback(const Storage::BoolResponse &response);
void createdBaseDirectoryErrorCallback(const Networking::ErrorResponse &error);
void resolveId();
void idResolvedCallback(Storage::UploadResponse response);
void idResolveFailedCallback(Networking::ErrorResponse error);
void createdDirectoryCallback(Storage::BoolResponse response);
void createdDirectoryErrorCallback(Networking::ErrorResponse error);
void idResolvedCallback(const Storage::UploadResponse &response);
void idResolveFailedCallback(const Networking::ErrorResponse &error);
void createdDirectoryCallback(const Storage::BoolResponse &response);
void createdDirectoryErrorCallback(const Networking::ErrorResponse &error);
void finishCreation(bool success);
public:
IdCreateDirectoryRequest(IdStorage *storage, Common::String parentPath, Common::String directoryName, Storage::BoolCallback cb, Networking::ErrorCallback ecb);
virtual ~IdCreateDirectoryRequest();
IdCreateDirectoryRequest(IdStorage *storage, const Common::String &parentPath, const Common::String &directoryName, Storage::BoolCallback cb, Networking::ErrorCallback ecb);
~IdCreateDirectoryRequest() override;
virtual void handle();
virtual void restart();
virtual Common::String date() const;
void handle() override;
void restart() override;
Common::String date() const override;
};
} // End of namespace Id

18
backends/cloud/id/iddownloadrequest.cpp
View File

@ -26,7 +26,7 @@
namespace Cloud {
namespace Id {
IdDownloadRequest::IdDownloadRequest(IdStorage *storage, Common::String remotePath, Common::String localPath, Storage::BoolCallback cb, Networking::ErrorCallback ecb):
IdDownloadRequest::IdDownloadRequest(IdStorage *storage, const Common::String &remotePath, const Common::String &localPath, Storage::BoolCallback cb, Networking::ErrorCallback ecb):
Networking::Request(nullptr, ecb), _requestedFile(remotePath), _requestedLocalFile(localPath), _storage(storage), _boolCallback(cb),
_workingRequest(nullptr), _ignoreCallback(false) {
start();
@ -48,36 +48,36 @@ void IdDownloadRequest::start() {
_ignoreCallback = false;
//find file's id
Storage::UploadCallback innerCallback = new Common::Callback<IdDownloadRequest, Storage::UploadResponse>(this, &IdDownloadRequest::idResolvedCallback);
Networking::ErrorCallback innerErrorCallback = new Common::Callback<IdDownloadRequest, Networking::ErrorResponse>(this, &IdDownloadRequest::idResolveFailedCallback);
Storage::UploadCallback innerCallback = new Common::Callback<IdDownloadRequest, const Storage::UploadResponse &>(this, &IdDownloadRequest::idResolvedCallback);
Networking::ErrorCallback innerErrorCallback = new Common::Callback<IdDownloadRequest, const Networking::ErrorResponse &>(this, &IdDownloadRequest::idResolveFailedCallback);
_workingRequest = _storage->resolveFileId(_requestedFile, innerCallback, innerErrorCallback);
}
void IdDownloadRequest::idResolvedCallback(Storage::UploadResponse response) {
void IdDownloadRequest::idResolvedCallback(const Storage::UploadResponse &response) {
_workingRequest = nullptr;
if (_ignoreCallback)
return;
Storage::BoolCallback innerCallback = new Common::Callback<IdDownloadRequest, Storage::BoolResponse>(this, &IdDownloadRequest::downloadCallback);
Networking::ErrorCallback innerErrorCallback = new Common::Callback<IdDownloadRequest, Networking::ErrorResponse>(this, &IdDownloadRequest::downloadErrorCallback);
Storage::BoolCallback innerCallback = new Common::Callback<IdDownloadRequest, const Storage::BoolResponse &>(this, &IdDownloadRequest::downloadCallback);
Networking::ErrorCallback innerErrorCallback = new Common::Callback<IdDownloadRequest, const Networking::ErrorResponse &>(this, &IdDownloadRequest::downloadErrorCallback);
_workingRequest = _storage->downloadById(response.value.id(), _requestedLocalFile, innerCallback, innerErrorCallback);
}
void IdDownloadRequest::idResolveFailedCallback(Networking::ErrorResponse error) {
void IdDownloadRequest::idResolveFailedCallback(const Networking::ErrorResponse &error) {
_workingRequest = nullptr;
if (_ignoreCallback)
return;
finishError(error);
}
void IdDownloadRequest::downloadCallback(Storage::BoolResponse response) {
void IdDownloadRequest::downloadCallback(const Storage::BoolResponse &response) {
_workingRequest = nullptr;
if (_ignoreCallback)
return;
finishDownload(response.value);
}
void IdDownloadRequest::downloadErrorCallback(Networking::ErrorResponse error) {
void IdDownloadRequest::downloadErrorCallback(const Networking::ErrorResponse &error) {
_workingRequest = nullptr;
if (_ignoreCallback)
return;

16
backends/cloud/id/iddownloadrequest.h
View File

@ -39,17 +39,17 @@ class IdDownloadRequest: public Networking::Request {
bool _ignoreCallback;
void start();
void idResolvedCallback(Storage::UploadResponse response);
void idResolveFailedCallback(Networking::ErrorResponse error);
void downloadCallback(Storage::BoolResponse response);
void downloadErrorCallback(Networking::ErrorResponse error);
void idResolvedCallback(const Storage::UploadResponse &response);
void idResolveFailedCallback(const Networking::ErrorResponse &error);
void downloadCallback(const Storage::BoolResponse &response);
void downloadErrorCallback(const Networking::ErrorResponse &error);
void finishDownload(bool success);
public:
IdDownloadRequest(IdStorage *storage, Common::String remotePath, Common::String localPath, Storage::BoolCallback cb, Networking::ErrorCallback ecb);
virtual ~IdDownloadRequest();
IdDownloadRequest(IdStorage *storage, const Common::String &remotePath, const Common::String &localPath, Storage::BoolCallback cb, Networking::ErrorCallback ecb);
~IdDownloadRequest() override;
virtual void handle();
virtual void restart();
void handle() override;
void restart() override;
/** Returns a number in range [0, 1], where 1 is "complete". */
double getProgress() const;

22
backends/cloud/id/idlistdirectoryrequest.cpp
View File

@ -25,7 +25,7 @@
namespace Cloud {
namespace Id {
IdListDirectoryRequest::IdListDirectoryRequest(IdStorage *storage, Common::String path, Storage::ListDirectoryCallback cb, Networking::ErrorCallback ecb, bool recursive):
IdListDirectoryRequest::IdListDirectoryRequest(IdStorage *storage, const Common::String &path, Storage::ListDirectoryCallback cb, Networking::ErrorCallback ecb, bool recursive):
Networking::Request(nullptr, ecb),
_requestedPath(path), _requestedRecursive(recursive), _storage(storage), _listDirectoryCallback(cb),
_workingRequest(nullptr), _ignoreCallback(false) {
@ -51,12 +51,12 @@ void IdListDirectoryRequest::start() {
_ignoreCallback = false;
//find out that directory's id
Storage::UploadCallback innerCallback = new Common::Callback<IdListDirectoryRequest, Storage::UploadResponse>(this, &IdListDirectoryRequest::idResolvedCallback);
Networking::ErrorCallback innerErrorCallback = new Common::Callback<IdListDirectoryRequest, Networking::ErrorResponse>(this, &IdListDirectoryRequest::idResolveErrorCallback);
Storage::UploadCallback innerCallback = new Common::Callback<IdListDirectoryRequest, const Storage::UploadResponse &>(this, &IdListDirectoryRequest::idResolvedCallback);
Networking::ErrorCallback innerErrorCallback = new Common::Callback<IdListDirectoryRequest, const Networking::ErrorResponse &>(this, &IdListDirectoryRequest::idResolveErrorCallback);
_workingRequest = _storage->resolveFileId(_requestedPath, innerCallback, innerErrorCallback);
}
void IdListDirectoryRequest::idResolvedCallback(Storage::UploadResponse response) {
void IdListDirectoryRequest::idResolvedCallback(const Storage::UploadResponse &response) {
_workingRequest = nullptr;
if (_ignoreCallback)
return;
@ -69,7 +69,7 @@ void IdListDirectoryRequest::idResolvedCallback(Storage::UploadResponse response
listNextDirectory();
}
void IdListDirectoryRequest::idResolveErrorCallback(Networking::ErrorResponse error) {
void IdListDirectoryRequest::idResolveErrorCallback(const Networking::ErrorResponse &error) {
_workingRequest = nullptr;
if (_ignoreCallback)
return;
@ -87,12 +87,12 @@ void IdListDirectoryRequest::listNextDirectory() {
_currentDirectory = _directoriesQueue.back();
_directoriesQueue.pop_back();
Storage::FileArrayCallback callback = new Common::Callback<IdListDirectoryRequest, Storage::FileArrayResponse>(this, &IdListDirectoryRequest::listedDirectoryCallback);
Networking::ErrorCallback failureCallback = new Common::Callback<IdListDirectoryRequest, Networking::ErrorResponse>(this, &IdListDirectoryRequest::listedDirectoryErrorCallback);
Storage::FileArrayCallback callback = new Common::Callback<IdListDirectoryRequest, const Storage::FileArrayResponse &>(this, &IdListDirectoryRequest::listedDirectoryCallback);
Networking::ErrorCallback failureCallback = new Common::Callback<IdListDirectoryRequest, const Networking::ErrorResponse &>(this, &IdListDirectoryRequest::listedDirectoryErrorCallback);
_workingRequest = _storage->listDirectoryById(_currentDirectory.id(), callback, failureCallback);
}
void IdListDirectoryRequest::listedDirectoryCallback(Storage::FileArrayResponse response) {
void IdListDirectoryRequest::listedDirectoryCallback(const Storage::FileArrayResponse &response) {
_workingRequest = nullptr;
if (_ignoreCallback)
return;
@ -100,7 +100,7 @@ void IdListDirectoryRequest::listedDirectoryCallback(Storage::FileArrayResponse
_date = response.request->date();
for (uint32 i = 0; i < response.value.size(); ++i) {
StorageFile &file = response.value[i];
StorageFile file = response.value[i];
Common::String path = _currentDirectory.path();
if (path.size() && path.lastChar() != '/' && path.lastChar() != '\\')
path += '/';
@ -115,7 +115,7 @@ void IdListDirectoryRequest::listedDirectoryCallback(Storage::FileArrayResponse
listNextDirectory();
}
void IdListDirectoryRequest::listedDirectoryErrorCallback(Networking::ErrorResponse error) {
void IdListDirectoryRequest::listedDirectoryErrorCallback(const Networking::ErrorResponse &error) {
_workingRequest = nullptr;
if (_ignoreCallback)
return;
@ -130,7 +130,7 @@ void IdListDirectoryRequest::restart() { start(); }
Common::String IdListDirectoryRequest::date() const { return _date; }
void IdListDirectoryRequest::finishListing(Common::Array<StorageFile> &files) {
void IdListDirectoryRequest::finishListing(const Common::Array<StorageFile> &files) {
Request::finishSuccess();
if (_listDirectoryCallback)
(*_listDirectoryCallback)(Storage::ListDirectoryResponse(this, files));

20
backends/cloud/id/idlistdirectoryrequest.h
View File

@ -44,19 +44,19 @@ class IdListDirectoryRequest: public Networking::Request {
Common::String _date;
void start();
void idResolvedCallback(Storage::UploadResponse response);
void idResolveErrorCallback(Networking::ErrorResponse error);
void idResolvedCallback(const Storage::UploadResponse &response);
void idResolveErrorCallback(const Networking::ErrorResponse &error);
void listNextDirectory();
void listedDirectoryCallback(Storage::FileArrayResponse response);
void listedDirectoryErrorCallback(Networking::ErrorResponse error);
void finishListing(Common::Array<StorageFile> &files);
void listedDirectoryCallback(const Storage::FileArrayResponse &response);
void listedDirectoryErrorCallback(const Networking::ErrorResponse &error);
void finishListing(const Common::Array<StorageFile> &files);
public:
IdListDirectoryRequest(IdStorage *storage, Common::String path, Storage::ListDirectoryCallback cb, Networking::ErrorCallback ecb, bool recursive = false);
virtual ~IdListDirectoryRequest();
IdListDirectoryRequest(IdStorage *storage, const Common::String &path, Storage::ListDirectoryCallback cb, Networking::ErrorCallback ecb, bool recursive = false);
~IdListDirectoryRequest() override;
virtual void handle();
virtual void restart();
virtual Common::String date() const;
void handle() override;
void restart() override;
Common::String date() const override;
};
} // End of namespace Id

16
backends/cloud/id/idresolveidrequest.cpp
View File

@ -25,7 +25,7 @@
namespace Cloud {
namespace Id {
IdResolveIdRequest::IdResolveIdRequest(IdStorage *storage, Common::String path, Storage::UploadCallback cb, Networking::ErrorCallback ecb, bool recursive):
IdResolveIdRequest::IdResolveIdRequest(IdStorage *storage, const Common::String &path, Storage::UploadCallback cb, Networking::ErrorCallback ecb, bool recursive):
Networking::Request(nullptr, ecb),
_requestedPath(path), _storage(storage), _uploadCallback(cb),
_workingRequest(nullptr), _ignoreCallback(false) {
@ -52,18 +52,18 @@ void IdResolveIdRequest::start() {
listNextDirectory(StorageFile(_currentDirectoryId, 0, 0, true));
}
void IdResolveIdRequest::listNextDirectory(StorageFile fileToReturn) {
void IdResolveIdRequest::listNextDirectory(const StorageFile &fileToReturn) {
if (_currentDirectory.equalsIgnoreCase(_requestedPath)) {
finishFile(fileToReturn);
return;
}
Storage::FileArrayCallback callback = new Common::Callback<IdResolveIdRequest, Storage::FileArrayResponse>(this, &IdResolveIdRequest::listedDirectoryCallback);
Networking::ErrorCallback failureCallback = new Common::Callback<IdResolveIdRequest, Networking::ErrorResponse>(this, &IdResolveIdRequest::listedDirectoryErrorCallback);
Storage::FileArrayCallback callback = new Common::Callback<IdResolveIdRequest, const Storage::FileArrayResponse &>(this, &IdResolveIdRequest::listedDirectoryCallback);
Networking::ErrorCallback failureCallback = new Common::Callback<IdResolveIdRequest, const Networking::ErrorResponse &>(this, &IdResolveIdRequest::listedDirectoryErrorCallback);
_workingRequest = _storage->listDirectoryById(_currentDirectoryId, callback, failureCallback);
}
void IdResolveIdRequest::listedDirectoryCallback(Storage::FileArrayResponse response) {
void IdResolveIdRequest::listedDirectoryCallback(const Storage::FileArrayResponse &response) {
_workingRequest = nullptr;
if (_ignoreCallback)
return;
@ -91,7 +91,7 @@ void IdResolveIdRequest::listedDirectoryCallback(Storage::FileArrayResponse resp
///debug(9, "IdResolveIdRequest: searching for '%s' in '%s'", currentLevelName.c_str(), _currentDirectory.c_str());
Common::Array<StorageFile> &files = response.value;
const Common::Array<StorageFile> &files = response.value;
bool found = false;
for (uint32 i = 0; i < files.size(); ++i) {
if ((files[i].isDirectory() || lastLevel) && files[i].name().equalsIgnoreCase(currentLevelName)) {
@ -114,7 +114,7 @@ void IdResolveIdRequest::listedDirectoryCallback(Storage::FileArrayResponse resp
}
}
void IdResolveIdRequest::listedDirectoryErrorCallback(Networking::ErrorResponse error) {
void IdResolveIdRequest::listedDirectoryErrorCallback(const Networking::ErrorResponse &error) {
_workingRequest = nullptr;
if (_ignoreCallback)
return;
@ -125,7 +125,7 @@ void IdResolveIdRequest::handle() {}
void IdResolveIdRequest::restart() { start(); }
void IdResolveIdRequest::finishFile(StorageFile file) {
void IdResolveIdRequest::finishFile(const StorageFile &file) {
Request::finishSuccess();
if (_uploadCallback)
(*_uploadCallback)(Storage::UploadResponse(this, file));

16
backends/cloud/id/idresolveidrequest.h
View File

@ -41,16 +41,16 @@ class IdResolveIdRequest: public Networking::Request {
bool _ignoreCallback;
void start();
void listNextDirectory(StorageFile fileToReturn);
void listedDirectoryCallback(Storage::FileArrayResponse response);
void listedDirectoryErrorCallback(Networking::ErrorResponse error);
void finishFile(StorageFile file);
void listNextDirectory(const StorageFile &fileToReturn);
void listedDirectoryCallback(const Storage::FileArrayResponse &response);
void listedDirectoryErrorCallback(const Networking::ErrorResponse &error);
void finishFile(const StorageFile &file);
public:
IdResolveIdRequest(IdStorage *storage, Common::String path, Storage::UploadCallback cb, Networking::ErrorCallback ecb, bool recursive = false); //TODO: why upload?
virtual ~IdResolveIdRequest();
IdResolveIdRequest(IdStorage *storage, const Common::String &path, Storage::UploadCallback cb, Networking::ErrorCallback ecb, bool recursive = false); //TODO: why upload?
~IdResolveIdRequest() override;
virtual void handle();
virtual void restart();
void handle() override;
void restart() override;
};
} // End of namespace Id

28
backends/cloud/id/idstorage.cpp
View File

@ -34,14 +34,14 @@ namespace Id {
IdStorage::IdStorage() {}
IdStorage::IdStorage(Common::String token, Common::String refreshToken, bool enabled):
IdStorage::IdStorage(const Common::String &token, const Common::String &refreshToken, bool enabled):
BaseStorage(token, refreshToken, enabled) {}
IdStorage::~IdStorage() {}
void IdStorage::printFiles(FileArrayResponse response) {
void IdStorage::printFiles(const FileArrayResponse &response) {
debug(9, "IdStorage: files:");
Common::Array<StorageFile> &files = response.value;
const Common::Array<StorageFile> &files = response.value;
for (uint32 i = 0; i < files.size(); ++i) {
debug(9, "\t%s%s", files[i].name().c_str(), files[i].isDirectory() ? " (directory)" : "");
debug(9, "\t%s", files[i].path().c_str());
@ -50,11 +50,11 @@ void IdStorage::printFiles(FileArrayResponse response) {
}
}
void IdStorage::printBool(BoolResponse response) {
void IdStorage::printBool(const BoolResponse &response) {
debug(9, "IdStorage: bool: %s", response.value ? "true" : "false");
}
void IdStorage::printFile(UploadResponse response) {
void IdStorage::printFile(const UploadResponse &response) {
debug(9, "\nIdStorage: uploaded file info:");
debug(9, "\tid: %s", response.value.path().c_str());
debug(9, "\tname: %s", response.value.name().c_str());
@ -63,30 +63,30 @@ void IdStorage::printFile(UploadResponse response) {
}
Storage::ListDirectoryCallback IdStorage::getPrintFilesCallback() {
return new Common::Callback<IdStorage, FileArrayResponse>(this, &IdStorage::printFiles);
return new Common::Callback<IdStorage, const FileArrayResponse &>(this, &IdStorage::printFiles);
}
Networking::Request *IdStorage::resolveFileId(Common::String path, UploadCallback callback, Networking::ErrorCallback errorCallback) {
Networking::Request *IdStorage::resolveFileId(const Common::String &path, UploadCallback callback, Networking::ErrorCallback errorCallback) {
if (!errorCallback)
errorCallback = getErrorPrintingCallback();
if (!callback)
callback = new Common::Callback<IdStorage, UploadResponse>(this, &IdStorage::printFile);
callback = new Common::Callback<IdStorage, const UploadResponse &>(this, &IdStorage::printFile);
return addRequest(new IdResolveIdRequest(this, path, callback, errorCallback));
}
Networking::Request *IdStorage::listDirectory(Common::String path, ListDirectoryCallback callback, Networking::ErrorCallback errorCallback, bool recursive) {
Networking::Request *IdStorage::listDirectory(const Common::String &path, ListDirectoryCallback callback, Networking::ErrorCallback errorCallback, bool recursive) {
if (!errorCallback)
errorCallback = getErrorPrintingCallback();
if (!callback)
callback = new Common::Callback<IdStorage, FileArrayResponse>(this, &IdStorage::printFiles);
callback = new Common::Callback<IdStorage, const FileArrayResponse &>(this, &IdStorage::printFiles);
return addRequest(new IdListDirectoryRequest(this, path, callback, errorCallback, recursive));
}
Networking::Request *IdStorage::createDirectory(Common::String path, BoolCallback callback, Networking::ErrorCallback errorCallback) {
Networking::Request *IdStorage::createDirectory(const Common::String &path, BoolCallback callback, Networking::ErrorCallback errorCallback) {
if (!errorCallback)
errorCallback = getErrorPrintingCallback();
if (!callback)
callback = new Common::Callback<IdStorage, BoolResponse>(this, &IdStorage::printBool);
callback = new Common::Callback<IdStorage, const BoolResponse &>(this, &IdStorage::printBool);
//find out the parent path and directory name
Common::String parentPath = "", directoryName = path;
@ -102,11 +102,11 @@ Networking::Request *IdStorage::createDirectory(Common::String path, BoolCallbac
return addRequest(new IdCreateDirectoryRequest(this, parentPath, directoryName, callback, errorCallback));
}
Networking::Request *IdStorage::streamFile(Common::String path, Networking::NetworkReadStreamCallback outerCallback, Networking::ErrorCallback errorCallback) {
Networking::Request *IdStorage::streamFile(const Common::String &path, Networking::NetworkReadStreamCallback outerCallback, Networking::ErrorCallback errorCallback) {
return addRequest(new IdStreamFileRequest(this, path, outerCallback, errorCallback));
}
Networking::Request *IdStorage::download(Common::String remotePath, Common::String localPath, BoolCallback callback, Networking::ErrorCallback errorCallback) {
Networking::Request *IdStorage::download(const Common::String &remotePath, const Common::String &localPath, BoolCallback callback, Networking::ErrorCallback errorCallback) {
return addRequest(new IdDownloadRequest(this, remotePath, localPath, callback, errorCallback));
}

26
backends/cloud/id/idstorage.h
View File

@ -44,36 +44,36 @@ namespace Id {
class IdStorage: public Cloud::BaseStorage {
protected:
void printFiles(FileArrayResponse response);
void printBool(BoolResponse response);
void printFile(UploadResponse response);
void printFiles(const FileArrayResponse &response);
void printBool(const BoolResponse &response);
void printFile(const UploadResponse &response);
ListDirectoryCallback getPrintFilesCallback();
public:
IdStorage();
IdStorage(Common::String token, Common::String refreshToken, bool enabled);
virtual ~IdStorage();
IdStorage(const Common::String &token, const Common::String &refreshToken, bool enabled);
~IdStorage() override;
/** Public Cloud API comes down there. */
/** Returns StorageFile with the resolved file's id. */
virtual Networking::Request *resolveFileId(Common::String path, UploadCallback callback, Networking::ErrorCallback errorCallback);
virtual Networking::Request *resolveFileId(const Common::String &path, UploadCallback callback, Networking::ErrorCallback errorCallback);
/** Returns ListDirectoryStatus struct with list of files. */
virtual Networking::Request *listDirectory(Common::String path, ListDirectoryCallback callback, Networking::ErrorCallback errorCallback, bool recursive = false);
virtual Networking::Request *listDirectoryById(Common::String id, ListDirectoryCallback callback, Networking::ErrorCallback errorCallback) = 0;
Networking::Request *listDirectory(const Common::String &path, ListDirectoryCallback callback, Networking::ErrorCallback errorCallback, bool recursive = false) override;
virtual Networking::Request *listDirectoryById(const Common::String &id, ListDirectoryCallback callback, Networking::ErrorCallback errorCallback) = 0;
/** Calls the callback when finished. */
virtual Networking::Request *createDirectory(Common::String path, BoolCallback callback, Networking::ErrorCallback errorCallback);
virtual Networking::Request *createDirectoryWithParentId(Common::String parentId, Common::String name, BoolCallback callback, Networking::ErrorCallback errorCallback) = 0;
Networking::Request *createDirectory(const Common::String &path, BoolCallback callback, Networking::ErrorCallback errorCallback) override;
virtual Networking::Request *createDirectoryWithParentId(const Common::String &parentId, const Common::String &name, BoolCallback callback, Networking::ErrorCallback errorCallback) = 0;
/** Returns pointer to Networking::NetworkReadStream. */
virtual Networking::Request *streamFile(Common::String path, Networking::NetworkReadStreamCallback callback, Networking::ErrorCallback errorCallback);
virtual Networking::Request *streamFileById(Common::String id, Networking::NetworkReadStreamCallback callback, Networking::ErrorCallback errorCallback) = 0;
Networking::Request *streamFile(const Common::String &path, Networking::NetworkReadStreamCallback callback, Networking::ErrorCallback errorCallback) override;
virtual Networking::Request *streamFileById(const Common::String &id, Networking::NetworkReadStreamCallback callback, Networking::ErrorCallback errorCallback) = 0;
/** Calls the callback when finished. */
virtual Networking::Request *download(Common::String remotePath, Common::String localPath, BoolCallback callback, Networking::ErrorCallback errorCallback);
Networking::Request *download(const Common::String &remotePath, const Common::String &localPath, BoolCallback callback, Networking::ErrorCallback errorCallback) override;
virtual Common::String getRootDirectoryId() = 0;
};

18
backends/cloud/id/idstreamfilerequest.cpp
View File

@ -25,7 +25,7 @@
namespace Cloud {
namespace Id {
IdStreamFileRequest::IdStreamFileRequest(IdStorage *storage, Common::String path, Networking::NetworkReadStreamCallback cb, Networking::ErrorCallback ecb):
IdStreamFileRequest::IdStreamFileRequest(IdStorage *storage, const Common::String &path, Networking::NetworkReadStreamCallback cb, Networking::ErrorCallback ecb):
Networking::Request(nullptr, ecb), _requestedFile(path), _storage(storage), _streamCallback(cb),
_workingRequest(nullptr), _ignoreCallback(false) {
start();
@ -47,36 +47,36 @@ void IdStreamFileRequest::start() {
_ignoreCallback = false;
//find file's id
Storage::UploadCallback innerCallback = new Common::Callback<IdStreamFileRequest, Storage::UploadResponse>(this, &IdStreamFileRequest::idResolvedCallback);
Networking::ErrorCallback innerErrorCallback = new Common::Callback<IdStreamFileRequest, Networking::ErrorResponse>(this, &IdStreamFileRequest::idResolveFailedCallback);
Storage::UploadCallback innerCallback = new Common::Callback<IdStreamFileRequest, const Storage::UploadResponse &>(this, &IdStreamFileRequest::idResolvedCallback);
Networking::ErrorCallback innerErrorCallback = new Common::Callback<IdStreamFileRequest, const Networking::ErrorResponse &>(this, &IdStreamFileRequest::idResolveFailedCallback);
_workingRequest = _storage->resolveFileId(_requestedFile, innerCallback, innerErrorCallback);
}
void IdStreamFileRequest::idResolvedCallback(Storage::UploadResponse response) {
void IdStreamFileRequest::idResolvedCallback(const Storage::UploadResponse &response) {
_workingRequest = nullptr;
if (_ignoreCallback)
return;
Networking::NetworkReadStreamCallback innerCallback = new Common::Callback<IdStreamFileRequest, Networking::NetworkReadStreamResponse>(this, &IdStreamFileRequest::streamFileCallback);
Networking::ErrorCallback innerErrorCallback = new Common::Callback<IdStreamFileRequest, Networking::ErrorResponse>(this, &IdStreamFileRequest::streamFileErrorCallback);
Networking::NetworkReadStreamCallback innerCallback = new Common::Callback<IdStreamFileRequest, const Networking::NetworkReadStreamResponse &>(this, &IdStreamFileRequest::streamFileCallback);
Networking::ErrorCallback innerErrorCallback = new Common::Callback<IdStreamFileRequest, const Networking::ErrorResponse &>(this, &IdStreamFileRequest::streamFileErrorCallback);
_workingRequest = _storage->streamFileById(response.value.id(), innerCallback, innerErrorCallback);
}
void IdStreamFileRequest::idResolveFailedCallback(Networking::ErrorResponse error) {
void IdStreamFileRequest::idResolveFailedCallback(const Networking::ErrorResponse &error) {
_workingRequest = nullptr;
if (_ignoreCallback)
return;
finishError(error);
}
void IdStreamFileRequest::streamFileCallback(Networking::NetworkReadStreamResponse response) {
void IdStreamFileRequest::streamFileCallback(const Networking::NetworkReadStreamResponse &response) {
_workingRequest = nullptr;
if (_ignoreCallback)
return;
finishStream(response.value);
}
void IdStreamFileRequest::streamFileErrorCallback(Networking::ErrorResponse error) {
void IdStreamFileRequest::streamFileErrorCallback(const Networking::ErrorResponse &error) {
_workingRequest = nullptr;
if (_ignoreCallback)
return;

16
backends/cloud/id/idstreamfilerequest.h
View File

@ -39,17 +39,17 @@ class IdStreamFileRequest: public Networking::Request {
bool _ignoreCallback;
void start();
void idResolvedCallback(Storage::UploadResponse response);
void idResolveFailedCallback(Networking::ErrorResponse error);
void streamFileCallback(Networking::NetworkReadStreamResponse response);
void streamFileErrorCallback(Networking::ErrorResponse error);
void idResolvedCallback(const Storage::UploadResponse &response);
void idResolveFailedCallback(const Networking::ErrorResponse &error);
void streamFileCallback(const Networking::NetworkReadStreamResponse &response);
void streamFileErrorCallback(const Networking::ErrorResponse &error);
void finishStream(Networking::NetworkReadStream *stream);
public:
IdStreamFileRequest(IdStorage *storage, Common::String path, Networking::NetworkReadStreamCallback cb, Networking::ErrorCallback ecb);
virtual ~IdStreamFileRequest();
IdStreamFileRequest(IdStorage *storage, const Common::String &path, Networking::NetworkReadStreamCallback cb, Networking::ErrorCallback ecb);
~IdStreamFileRequest() override;
virtual void handle();
virtual void restart();
void handle() override;
void restart() override;
};
} // End of namespace Id

14
backends/cloud/onedrive/onedrivecreatedirectoryrequest.cpp
View File

@ -32,7 +32,7 @@ namespace OneDrive {
#define ONEDRIVE_API_SPECIAL_APPROOT "https://graph.microsoft.com/v1.0/drive/special/approot"
OneDriveCreateDirectoryRequest::OneDriveCreateDirectoryRequest(OneDriveStorage *storage, Common::String path, Storage::BoolCallback cb, Networking::ErrorCallback ecb):
OneDriveCreateDirectoryRequest::OneDriveCreateDirectoryRequest(OneDriveStorage *storage, const Common::String &path, Storage::BoolCallback cb, Networking::ErrorCallback ecb):
Networking::Request(nullptr, ecb), _storage(storage), _path(path), _boolCallback(cb),
_workingRequest(nullptr), _ignoreCallback(false) {
start();
@ -70,8 +70,8 @@ void OneDriveCreateDirectoryRequest::start() {
if (parent != "")
url += ":/" + ConnMan.urlEncode(parent) + ":";
url += "/children";
Networking::JsonCallback innerCallback = new Common::Callback<OneDriveCreateDirectoryRequest, Networking::JsonResponse>(this, &OneDriveCreateDirectoryRequest::responseCallback);
Networking::ErrorCallback errorResponseCallback = new Common::Callback<OneDriveCreateDirectoryRequest, Networking::ErrorResponse>(this, &OneDriveCreateDirectoryRequest::errorCallback);
Networking::JsonCallback innerCallback = new Common::Callback<OneDriveCreateDirectoryRequest, const Networking::JsonResponse &>(this, &OneDriveCreateDirectoryRequest::responseCallback);
Networking::ErrorCallback errorResponseCallback = new Common::Callback<OneDriveCreateDirectoryRequest, const Networking::ErrorResponse &>(this, &OneDriveCreateDirectoryRequest::errorCallback);
Networking::CurlJsonRequest *request = new OneDriveTokenRefresher(_storage, innerCallback, errorResponseCallback, url.c_str());
request->addHeader("Authorization: Bearer " + _storage->accessToken());
request->addHeader("Content-Type: application/json");
@ -85,8 +85,8 @@ void OneDriveCreateDirectoryRequest::start() {
_workingRequest = ConnMan.addRequest(request);
}
void OneDriveCreateDirectoryRequest::responseCallback(Networking::JsonResponse response) {
Common::JSONValue *json = response.value;
void OneDriveCreateDirectoryRequest::responseCallback(const Networking::JsonResponse &response) {
const Common::JSONValue *json = response.value;
_workingRequest = nullptr;
if (_ignoreCallback) {
delete json;
@ -96,7 +96,7 @@ void OneDriveCreateDirectoryRequest::responseCallback(Networking::JsonResponse r
_date = response.request->date();
Networking::ErrorResponse error(this, "OneDriveCreateDirectoryRequest::responseCallback: unknown error");
Networking::CurlJsonRequest *rq = (Networking::CurlJsonRequest *)response.request;
const Networking::CurlJsonRequest *rq = (const Networking::CurlJsonRequest *)response.request;
if (rq && rq->getNetworkReadStream())
error.httpResponseCode = rq->getNetworkReadStream()->httpResponseCode();
@ -124,7 +124,7 @@ void OneDriveCreateDirectoryRequest::responseCallback(Networking::JsonResponse r
delete json;
}
void OneDriveCreateDirectoryRequest::errorCallback(Networking::ErrorResponse error) {
void OneDriveCreateDirectoryRequest::errorCallback(const Networking::ErrorResponse &error) {
_workingRequest = nullptr;
if (_ignoreCallback)
return;

14
backends/cloud/onedrive/onedrivecreatedirectoryrequest.h
View File

@ -40,16 +40,16 @@ class OneDriveCreateDirectoryRequest: public Networking::Request {
Common::String _date;
void start();
void responseCallback(Networking::JsonResponse response);
void errorCallback(Networking::ErrorResponse error);
void responseCallback(const Networking::JsonResponse &response);
void errorCallback(const Networking::ErrorResponse &error);
void finishCreation(bool success);
public:
OneDriveCreateDirectoryRequest(OneDriveStorage *storage, Common::String path, Storage::BoolCallback cb, Networking::ErrorCallback ecb);
virtual ~OneDriveCreateDirectoryRequest();
OneDriveCreateDirectoryRequest(OneDriveStorage *storage, const Common::String &path, Storage::BoolCallback cb, Networking::ErrorCallback ecb);
~OneDriveCreateDirectoryRequest() override;
virtual void handle();
virtual void restart();
virtual Common::String date() const;
void handle() override;
void restart() override;
Common::String date() const override;
};
} // End of namespace OneDrive

18
backends/cloud/onedrive/onedrivelistdirectoryrequest.cpp
View File

@ -33,7 +33,7 @@ namespace OneDrive {
#define ONEDRIVE_API_SPECIAL_APPROOT_CHILDREN "https://graph.microsoft.com/v1.0/drive/special/approot:/%s:/children"
#define ONEDRIVE_API_SPECIAL_APPROOT_CHILDREN_ROOT_ITSELF "https://graph.microsoft.com/v1.0/drive/special/approot/children"
OneDriveListDirectoryRequest::OneDriveListDirectoryRequest(OneDriveStorage *storage, Common::String path, Storage::ListDirectoryCallback cb, Networking::ErrorCallback ecb, bool recursive):
OneDriveListDirectoryRequest::OneDriveListDirectoryRequest(OneDriveStorage *storage, const Common::String &path, Storage::ListDirectoryCallback cb, Networking::ErrorCallback ecb, bool recursive):
Networking::Request(nullptr, ecb),
_requestedPath(path), _requestedRecursive(recursive), _storage(storage), _listDirectoryCallback(cb),
_workingRequest(nullptr), _ignoreCallback(false) {
@ -81,17 +81,17 @@ void OneDriveListDirectoryRequest::listNextDirectory() {
makeRequest(url);
}
void OneDriveListDirectoryRequest::makeRequest(Common::String url) {
Networking::JsonCallback callback = new Common::Callback<OneDriveListDirectoryRequest, Networking::JsonResponse>(this, &OneDriveListDirectoryRequest::listedDirectoryCallback);
Networking::ErrorCallback failureCallback = new Common::Callback<OneDriveListDirectoryRequest, Networking::ErrorResponse>(this, &OneDriveListDirectoryRequest::listedDirectoryErrorCallback);
void OneDriveListDirectoryRequest::makeRequest(const Common::String &url) {
Networking::JsonCallback callback = new Common::Callback<OneDriveListDirectoryRequest, const Networking::JsonResponse &>(this, &OneDriveListDirectoryRequest::listedDirectoryCallback);
Networking::ErrorCallback failureCallback = new Common::Callback<OneDriveListDirectoryRequest, const Networking::ErrorResponse &>(this, &OneDriveListDirectoryRequest::listedDirectoryErrorCallback);
Networking::CurlJsonRequest *request = new OneDriveTokenRefresher(_storage, callback, failureCallback, url.c_str());
request->addHeader("Authorization: bearer " + _storage->accessToken());
_workingRequest = ConnMan.addRequest(request);
}
void OneDriveListDirectoryRequest::listedDirectoryCallback(Networking::JsonResponse response) {
void OneDriveListDirectoryRequest::listedDirectoryCallback(const Networking::JsonResponse &response) {
_workingRequest = nullptr;
Common::JSONValue *json = response.value;
const Common::JSONValue *json = response.value;
if (_ignoreCallback) {
delete json;
@ -102,7 +102,7 @@ void OneDriveListDirectoryRequest::listedDirectoryCallback(Networking::JsonRespo
_date = response.request->date();
Networking::ErrorResponse error(this, "OneDriveListDirectoryRequest::listedDirectoryCallback: unknown error");
Networking::CurlJsonRequest *rq = (Networking::CurlJsonRequest *)response.request;
const Networking::CurlJsonRequest *rq = (const Networking::CurlJsonRequest *)response.request;
if (rq && rq->getNetworkReadStream())
error.httpResponseCode = rq->getNetworkReadStream()->httpResponseCode();
@ -169,7 +169,7 @@ void OneDriveListDirectoryRequest::listedDirectoryCallback(Networking::JsonRespo
delete json;
}
void OneDriveListDirectoryRequest::listedDirectoryErrorCallback(Networking::ErrorResponse error) {
void OneDriveListDirectoryRequest::listedDirectoryErrorCallback(const Networking::ErrorResponse &error) {
_workingRequest = nullptr;
if (_ignoreCallback)
return;
@ -184,7 +184,7 @@ void OneDriveListDirectoryRequest::restart() { start(); }
Common::String OneDriveListDirectoryRequest::date() const { return _date; }
void OneDriveListDirectoryRequest::finishListing(Common::Array<StorageFile> &files) {
void OneDriveListDirectoryRequest::finishListing(const Common::Array<StorageFile> &files) {
Request::finishSuccess();
if (_listDirectoryCallback)
(*_listDirectoryCallback)(Storage::ListDirectoryResponse(this, files));

18
backends/cloud/onedrive/onedrivelistdirectoryrequest.h
View File

@ -46,17 +46,17 @@ class OneDriveListDirectoryRequest: public Networking::Request {
void start();
void listNextDirectory();
void listedDirectoryCallback(Networking::JsonResponse response);
void listedDirectoryErrorCallback(Networking::ErrorResponse error);
void makeRequest(Common::String url);
void finishListing(Common::Array<StorageFile> &files);
void listedDirectoryCallback(const Networking::JsonResponse &response);
void listedDirectoryErrorCallback(const Networking::ErrorResponse &error);
void makeRequest(const Common::String &url);
void finishListing(const Common::Array<StorageFile> &files);
public:
OneDriveListDirectoryRequest(OneDriveStorage *storage, Common::String path, Storage::ListDirectoryCallback cb, Networking::ErrorCallback ecb, bool recursive = false);
virtual ~OneDriveListDirectoryRequest();
OneDriveListDirectoryRequest(OneDriveStorage *storage, const Common::String &path, Storage::ListDirectoryCallback cb, Networking::ErrorCallback ecb, bool recursive = false);
~OneDriveListDirectoryRequest() override;
virtual void handle();
virtual void restart();
virtual Common::String date() const;
void handle() override;
void restart() override;
Common::String date() const override;
};
} // End of namespace OneDrive

32
backends/cloud/onedrive/onedrivestorage.cpp
View File

@ -41,14 +41,14 @@ namespace OneDrive {
#define ONEDRIVE_API_SPECIAL_APPROOT_ID "https://graph.microsoft.com/v1.0/drive/special/approot:/"
#define ONEDRIVE_API_SPECIAL_APPROOT "https://graph.microsoft.com/v1.0/drive/special/approot"
OneDriveStorage::OneDriveStorage(Common::String token, Common::String refreshToken, bool enabled):
OneDriveStorage::OneDriveStorage(const Common::String &token, const Common::String &refreshToken, bool enabled):
BaseStorage(token, refreshToken, enabled) {}
OneDriveStorage::OneDriveStorage(Common::String code, Networking::ErrorCallback cb) {
OneDriveStorage::OneDriveStorage(const Common::String &code, Networking::ErrorCallback cb) {
getAccessToken(code, cb);
}
OneDriveStorage::OneDriveStorage(Networking::JsonResponse codeFlowJson, Networking::ErrorCallback cb) {
OneDriveStorage::OneDriveStorage(const Networking::JsonResponse &codeFlowJson, Networking::ErrorCallback cb) {
codeFlowComplete(cb, codeFlowJson);
}
@ -62,7 +62,7 @@ bool OneDriveStorage::needsRefreshToken() { return true; }
bool OneDriveStorage::canReuseRefreshToken() { return false; }
void OneDriveStorage::saveConfig(Common::String keyPrefix) {
void OneDriveStorage::saveConfig(const Common::String &keyPrefix) {
ConfMan.set(keyPrefix + "access_token", _token, ConfMan.kCloudDomain);
ConfMan.set(keyPrefix + "refresh_token", _refreshToken, ConfMan.kCloudDomain);
saveIsEnabledFlag(keyPrefix);
@ -72,8 +72,8 @@ Common::String OneDriveStorage::name() const {
return "OneDrive";
}
void OneDriveStorage::infoInnerCallback(StorageInfoCallback outerCallback, Networking::JsonResponse response) {
Common::JSONValue *json = response.value;
void OneDriveStorage::infoInnerCallback(StorageInfoCallback outerCallback, const Networking::JsonResponse &response) {
const Common::JSONValue *json = response.value;
if (!json) {
warning("OneDriveStorage::infoInnerCallback: NULL passed instead of JSON");
delete outerCallback;
@ -121,8 +121,8 @@ void OneDriveStorage::infoInnerCallback(StorageInfoCallback outerCallback, Netwo
delete json;
}
void OneDriveStorage::fileInfoCallback(Networking::NetworkReadStreamCallback outerCallback, Networking::JsonResponse response) {
Common::JSONValue *json = response.value;
void OneDriveStorage::fileInfoCallback(Networking::NetworkReadStreamCallback outerCallback, const Networking::JsonResponse &response) {
const Common::JSONValue *json = response.value;
if (!json) {
warning("OneDriveStorage::fileInfoCallback: NULL passed instead of JSON");
if (outerCallback)
@ -161,26 +161,26 @@ void OneDriveStorage::fileInfoCallback(Networking::NetworkReadStreamCallback out
delete outerCallback;
}
Networking::Request *OneDriveStorage::listDirectory(Common::String path, ListDirectoryCallback callback, Networking::ErrorCallback errorCallback, bool recursive) {
Networking::Request *OneDriveStorage::listDirectory(const Common::String &path, ListDirectoryCallback callback, Networking::ErrorCallback errorCallback, bool recursive) {
debug(9, "OneDrive: `ls \"%s\"`", path.c_str());
return addRequest(new OneDriveListDirectoryRequest(this, path, callback, errorCallback, recursive));
}
Networking::Request *OneDriveStorage::upload(Common::String path, Common::SeekableReadStream *contents, UploadCallback callback, Networking::ErrorCallback errorCallback) {
Networking::Request *OneDriveStorage::upload(const Common::String &path, Common::SeekableReadStream *contents, UploadCallback callback, Networking::ErrorCallback errorCallback) {
debug(9, "OneDrive: `upload \"%s\"`", path.c_str());
return addRequest(new OneDriveUploadRequest(this, path, contents, callback, errorCallback));
}
Networking::Request *OneDriveStorage::streamFileById(Common::String path, Networking::NetworkReadStreamCallback outerCallback, Networking::ErrorCallback errorCallback) {
Networking::Request *OneDriveStorage::streamFileById(const Common::String &path, Networking::NetworkReadStreamCallback outerCallback, Networking::ErrorCallback errorCallback) {
debug(9, "OneDrive: `download \"%s\"`", path.c_str());
Common::String url = ONEDRIVE_API_SPECIAL_APPROOT_ID + ConnMan.urlEncode(path);
Networking::JsonCallback innerCallback = new Common::CallbackBridge<OneDriveStorage, Networking::NetworkReadStreamResponse, Networking::JsonResponse>(this, &OneDriveStorage::fileInfoCallback, outerCallback);
Networking::JsonCallback innerCallback = new Common::CallbackBridge<OneDriveStorage, const Networking::NetworkReadStreamResponse &, const Networking::JsonResponse &>(this, &OneDriveStorage::fileInfoCallback, outerCallback);
Networking::CurlJsonRequest *request = new OneDriveTokenRefresher(this, innerCallback, errorCallback, url.c_str());
request->addHeader("Authorization: bearer " + _token);
return addRequest(request);
}
Networking::Request *OneDriveStorage::createDirectory(Common::String path, BoolCallback callback, Networking::ErrorCallback errorCallback) {
Networking::Request *OneDriveStorage::createDirectory(const Common::String &path, BoolCallback callback, Networking::ErrorCallback errorCallback) {
debug(9, "OneDrive: `mkdir \"%s\"`", path.c_str());
if (!errorCallback)
errorCallback = getErrorPrintingCallback();
@ -189,7 +189,7 @@ Networking::Request *OneDriveStorage::createDirectory(Common::String path, BoolC
Networking::Request *OneDriveStorage::info(StorageInfoCallback callback, Networking::ErrorCallback errorCallback) {
debug(9, "OneDrive: `info`");
Networking::JsonCallback innerCallback = new Common::CallbackBridge<OneDriveStorage, StorageInfoResponse, Networking::JsonResponse>(this, &OneDriveStorage::infoInnerCallback, callback);
Networking::JsonCallback innerCallback = new Common::CallbackBridge<OneDriveStorage, const StorageInfoResponse &, const Networking::JsonResponse &>(this, &OneDriveStorage::infoInnerCallback, callback);
Networking::CurlJsonRequest *request = new OneDriveTokenRefresher(this, innerCallback, errorCallback, ONEDRIVE_API_SPECIAL_APPROOT);
request->addHeader("Authorization: bearer " + _token);
return addRequest(request);
@ -197,7 +197,7 @@ Networking::Request *OneDriveStorage::info(StorageInfoCallback callback, Network
Common::String OneDriveStorage::savesDirectoryPath() { return "saves/"; }
OneDriveStorage *OneDriveStorage::loadFromConfig(Common::String keyPrefix) {
OneDriveStorage *OneDriveStorage::loadFromConfig(const Common::String &keyPrefix) {
if (!ConfMan.hasKey(keyPrefix + "access_token", ConfMan.kCloudDomain)) {
warning("OneDriveStorage: no access_token found");
return nullptr;
@ -213,7 +213,7 @@ OneDriveStorage *OneDriveStorage::loadFromConfig(Common::String keyPrefix) {
return new OneDriveStorage(accessToken, refreshToken, loadIsEnabledFlag(keyPrefix));
}
void OneDriveStorage::removeFromConfig(Common::String keyPrefix) {
void OneDriveStorage::removeFromConfig(const Common::String &keyPrefix) {
ConfMan.removeKey(keyPrefix + "access_token", ConfMan.kCloudDomain);
ConfMan.removeKey(keyPrefix + "refresh_token", ConfMan.kCloudDomain);
removeIsEnabledFlag(keyPrefix);

40
backends/cloud/onedrive/onedrivestorage.h
View File

@ -30,36 +30,36 @@ namespace OneDrive {
class OneDriveStorage: public Cloud::BaseStorage {
/** This private constructor is called from loadFromConfig(). */
OneDriveStorage(Common::String token, Common::String refreshToken, bool enabled);
OneDriveStorage(const Common::String &token, const Common::String &refreshToken, bool enabled);
/** Constructs StorageInfo based on JSON response from cloud. */
void infoInnerCallback(StorageInfoCallback outerCallback, Networking::JsonResponse json);
void infoInnerCallback(StorageInfoCallback outerCallback, const Networking::JsonResponse &json);
void fileInfoCallback(Networking::NetworkReadStreamCallback outerCallback, Networking::JsonResponse response);
void fileInfoCallback(Networking::NetworkReadStreamCallback outerCallback, const Networking::JsonResponse &response);
protected:
/**
* @return "onedrive"
*/
virtual Common::String cloudProvider();
Common::String cloudProvider() override;
/**
* @return kStorageOneDriveId
*/
virtual uint32 storageIndex();
uint32 storageIndex() override;
virtual bool needsRefreshToken();
bool needsRefreshToken() override;
virtual bool canReuseRefreshToken();
bool canReuseRefreshToken() override;
public:
/** This constructor uses OAuth code flow to get tokens. */
OneDriveStorage(Common::String code, Networking::ErrorCallback cb);
OneDriveStorage(const Common::String &code, Networking::ErrorCallback cb);
/** This constructor extracts tokens from JSON acquired via OAuth code flow. */
OneDriveStorage(Networking::JsonResponse codeFlowJson, Networking::ErrorCallback cb);
OneDriveStorage(const Networking::JsonResponse &codeFlowJson, Networking::ErrorCallback cb);
virtual ~OneDriveStorage();
~OneDriveStorage() override;
/**
* Storage methods, which are used by CloudManager to save
@ -72,44 +72,44 @@ public:
* @note every Storage must write keyPrefix + "type" key
* with common value (e.g. "Dropbox").
*/
virtual void saveConfig(Common::String keyPrefix);
void saveConfig(const Common::String &keyPrefix) override;
/**
* Return unique storage name.
* @returns some unique storage name (for example, "Dropbox (user@example.com)")
*/
virtual Common::String name() const;
Common::String name() const override;
/** Public Cloud API comes down there. */
/** Returns ListDirectoryStatus struct with list of files. */
virtual Networking::Request *listDirectory(Common::String path, ListDirectoryCallback callback, Networking::ErrorCallback errorCallback, bool recursive = false);
Networking::Request *listDirectory(const Common::String &path, ListDirectoryCallback callback, Networking::ErrorCallback errorCallback, bool recursive = false) override;
/** Returns UploadStatus struct with info about uploaded file. */
virtual Networking::Request *upload(Common::String path, Common::SeekableReadStream *contents, UploadCallback callback, Networking::ErrorCallback errorCallback);
Networking::Request *upload(const Common::String &path, Common::SeekableReadStream *contents, UploadCallback callback, Networking::ErrorCallback errorCallback) override;
/** Returns pointer to Networking::NetworkReadStream. */
virtual Networking::Request *streamFileById(Common::String path, Networking::NetworkReadStreamCallback callback, Networking::ErrorCallback errorCallback);
Networking::Request *streamFileById(const Common::String &path, Networking::NetworkReadStreamCallback callback, Networking::ErrorCallback errorCallback) override;
/** Calls the callback when finished. */
virtual Networking::Request *createDirectory(Common::String path, BoolCallback callback, Networking::ErrorCallback errorCallback);
Networking::Request *createDirectory(const Common::String &path, BoolCallback callback, Networking::ErrorCallback errorCallback) override;
/** Returns the StorageInfo struct. */
virtual Networking::Request *info(StorageInfoCallback callback, Networking::ErrorCallback errorCallback);
Networking::Request *info(StorageInfoCallback callback, Networking::ErrorCallback errorCallback) override;
/** Returns storage's saves directory path with the trailing slash. */
virtual Common::String savesDirectoryPath();
Common::String savesDirectoryPath() override;
/**
* Load token and user id from configs and return OneDriveStorage for those.
* @return pointer to the newly created OneDriveStorage or 0 if some problem occurred.
*/
static OneDriveStorage *loadFromConfig(Common::String keyPrefix);
static OneDriveStorage *loadFromConfig(const Common::String &keyPrefix);
/**
* Remove all OneDriveStorage-related data from config.
*/
static void removeFromConfig(Common::String keyPrefix);
static void removeFromConfig(const Common::String &keyPrefix);
Common::String accessToken() const { return _token; }
};

12
backends/cloud/onedrive/onedrivetokenrefresher.cpp
View File

@ -36,7 +36,7 @@ OneDriveTokenRefresher::OneDriveTokenRefresher(OneDriveStorage *parent, Networki
OneDriveTokenRefresher::~OneDriveTokenRefresher() {}
void OneDriveTokenRefresher::tokenRefreshed(Storage::BoolResponse response) {
void OneDriveTokenRefresher::tokenRefreshed(const Storage::BoolResponse &response) {
if (!response.value) {
//failed to refresh token, notify user with NULL in original callback
warning("OneDriveTokenRefresher: failed to refresh token");
@ -56,7 +56,7 @@ void OneDriveTokenRefresher::tokenRefreshed(Storage::BoolResponse response) {
retry(0);
}
void OneDriveTokenRefresher::finishJson(Common::JSONValue *json) {
void OneDriveTokenRefresher::finishJson(const Common::JSONValue *json) {
if (!json) {
//that's probably not an error (200 OK)
CurlJsonRequest::finishJson(nullptr);
@ -105,7 +105,7 @@ void OneDriveTokenRefresher::finishJson(Common::JSONValue *json) {
pause();
delete json;
_parentStorage->refreshAccessToken(new Common::Callback<OneDriveTokenRefresher, Storage::BoolResponse>(this, &OneDriveTokenRefresher::tokenRefreshed));
_parentStorage->refreshAccessToken(new Common::Callback<OneDriveTokenRefresher, const Storage::BoolResponse &>(this, &OneDriveTokenRefresher::tokenRefreshed));
return;
}
}
@ -114,7 +114,7 @@ void OneDriveTokenRefresher::finishJson(Common::JSONValue *json) {
CurlJsonRequest::finishJson(json);
}
void OneDriveTokenRefresher::finishError(Networking::ErrorResponse error, Networking::RequestState state) {
void OneDriveTokenRefresher::finishError(const Networking::ErrorResponse &error, Networking::RequestState state) {
if (error.failed) {
Common::JSONValue *value = Common::JSON::parse(error.response.c_str());
@ -137,7 +137,7 @@ void OneDriveTokenRefresher::finishError(Networking::ErrorResponse error, Networ
Request::finishError(error); //call closest base class's method
}
void OneDriveTokenRefresher::setHeaders(Common::Array<Common::String> &headers) {
void OneDriveTokenRefresher::setHeaders(const Common::Array<Common::String> &headers) {
_headers = headers;
curl_slist_free_all(_headersList);
_headersList = nullptr;
@ -145,7 +145,7 @@ void OneDriveTokenRefresher::setHeaders(Common::Array<Common::String> &headers)
CurlJsonRequest::addHeader(headers[i]);
}
void OneDriveTokenRefresher::addHeader(Common::String header) {
void OneDriveTokenRefresher::addHeader(const Common::String &header) {
_headers.push_back(header);
CurlJsonRequest::addHeader(header);
}

12
backends/cloud/onedrive/onedrivetokenrefresher.h
View File

@ -34,16 +34,16 @@ class OneDriveTokenRefresher: public Networking::CurlJsonRequest {
OneDriveStorage *_parentStorage;
Common::Array<Common::String> _headers;
void tokenRefreshed(Storage::BoolResponse response);
void tokenRefreshed(const Storage::BoolResponse &response);
virtual void finishJson(Common::JSONValue *json);
virtual void finishError(Networking::ErrorResponse error, Networking::RequestState state = Networking::FINISHED);
void finishJson(const Common::JSONValue *json) override;
void finishError(const Networking::ErrorResponse &error, Networking::RequestState state = Networking::FINISHED) override;
public:
OneDriveTokenRefresher(OneDriveStorage *parent, Networking::JsonCallback callback, Networking::ErrorCallback ecb, const char *url);
virtual ~OneDriveTokenRefresher();
~OneDriveTokenRefresher() override;
virtual void setHeaders(Common::Array<Common::String> &headers);
virtual void addHeader(Common::String header);
void setHeaders(const Common::Array<Common::String> &headers) override;
void addHeader(const Common::String &header) override;
};
} // End of namespace OneDrive

20
backends/cloud/onedrive/onedriveuploadrequest.cpp
View File

@ -35,7 +35,7 @@ namespace OneDrive {
#define ONEDRIVE_API_SPECIAL_APPROOT_UPLOAD "https://graph.microsoft.com/v1.0/drive/special/approot:/%s:/upload.createSession"
#define ONEDRIVE_API_SPECIAL_APPROOT_CONTENT "https://graph.microsoft.com/v1.0/drive/special/approot:/%s:/content"
OneDriveUploadRequest::OneDriveUploadRequest(OneDriveStorage *storage, Common::String path, Common::SeekableReadStream *contents, Storage::UploadCallback callback, Networking::ErrorCallback ecb):
OneDriveUploadRequest::OneDriveUploadRequest(OneDriveStorage *storage, const 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) {
start();
@ -73,8 +73,8 @@ void OneDriveUploadRequest::uploadNextPart() {
if (_uploadUrl == "" && (uint32)_contentsStream->size() > UPLOAD_PER_ONE_REQUEST) {
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::JsonCallback callback = new Common::Callback<OneDriveUploadRequest, const Networking::JsonResponse &>(this, &OneDriveUploadRequest::partUploadedCallback);
Networking::ErrorCallback failureCallback = new Common::Callback<OneDriveUploadRequest, const Networking::ErrorResponse &>(this, &OneDriveUploadRequest::partUploadedErrorCallback);
Networking::CurlJsonRequest *request = new OneDriveTokenRefresher(_storage, callback, failureCallback, url.c_str());
request->addHeader("Authorization: Bearer " + _storage->accessToken());
request->setBuffer(new byte[1], 0); //use POST
@ -89,8 +89,8 @@ void OneDriveUploadRequest::uploadNextPart() {
url = _uploadUrl;
}
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::JsonCallback callback = new Common::Callback<OneDriveUploadRequest, const Networking::JsonResponse &>(this, &OneDriveUploadRequest::partUploadedCallback);
Networking::ErrorCallback failureCallback = new Common::Callback<OneDriveUploadRequest, const Networking::ErrorResponse &>(this, &OneDriveUploadRequest::partUploadedErrorCallback);
Networking::CurlJsonRequest *request = new OneDriveTokenRefresher(_storage, callback, failureCallback, url.c_str());
request->addHeader("Authorization: Bearer " + _storage->accessToken());
request->usePut();
@ -115,17 +115,17 @@ void OneDriveUploadRequest::uploadNextPart() {
_workingRequest = ConnMan.addRequest(request);
}
void OneDriveUploadRequest::partUploadedCallback(Networking::JsonResponse response) {
void OneDriveUploadRequest::partUploadedCallback(const Networking::JsonResponse &response) {
_workingRequest = nullptr;
if (_ignoreCallback)
return;
Networking::ErrorResponse error(this, false, true, "", -1);
Networking::CurlJsonRequest *rq = (Networking::CurlJsonRequest *)response.request;
const Networking::CurlJsonRequest *rq = (const Networking::CurlJsonRequest *)response.request;
if (rq && rq->getNetworkReadStream())
error.httpResponseCode = rq->getNetworkReadStream()->httpResponseCode();
Common::JSONValue *json = response.value;
const Common::JSONValue *json = response.value;
if (json == nullptr) {
error.response = "Failed to parse JSON, null passed!";
finishError(error);
@ -171,7 +171,7 @@ void OneDriveUploadRequest::partUploadedCallback(Networking::JsonResponse respon
delete json;
}
void OneDriveUploadRequest::partUploadedErrorCallback(Networking::ErrorResponse error) {
void OneDriveUploadRequest::partUploadedErrorCallback(const Networking::ErrorResponse &error) {
_workingRequest = nullptr;
if (_ignoreCallback)
return;
@ -182,7 +182,7 @@ void OneDriveUploadRequest::handle() {}
void OneDriveUploadRequest::restart() { start(); }
void OneDriveUploadRequest::finishUpload(StorageFile file) {
void OneDriveUploadRequest::finishUpload(const StorageFile &file) {
Request::finishSuccess();
if (_uploadCallback)
(*_uploadCallback)(Storage::UploadResponse(this, file));

14
backends/cloud/onedrive/onedriveuploadrequest.h
View File

@ -42,16 +42,16 @@ class OneDriveUploadRequest: public Networking::Request {
void start();
void uploadNextPart();
void partUploadedCallback(Networking::JsonResponse response);
void partUploadedErrorCallback(Networking::ErrorResponse error);
void finishUpload(StorageFile status);
void partUploadedCallback(const Networking::JsonResponse &response);
void partUploadedErrorCallback(const Networking::ErrorResponse &error);
void finishUpload(const StorageFile &status);
public:
OneDriveUploadRequest(OneDriveStorage *storage, Common::String path, Common::SeekableReadStream *contents, Storage::UploadCallback callback, Networking::ErrorCallback ecb);
virtual ~OneDriveUploadRequest();
OneDriveUploadRequest(OneDriveStorage *storage, const Common::String &path, Common::SeekableReadStream *contents, Storage::UploadCallback callback, Networking::ErrorCallback ecb);
~OneDriveUploadRequest() override;
virtual void handle();
virtual void restart();
void handle() override;
void restart() override;
};
} // End of namespace OneDrive

42
backends/cloud/savessyncrequest.cpp
View File

@ -70,13 +70,13 @@ void SavesSyncRequest::start() {
dir.deleteLastChar();
_workingRequest = _storage->listDirectory(
dir,
new Common::Callback<SavesSyncRequest, Storage::ListDirectoryResponse>(this, &SavesSyncRequest::directoryListedCallback),
new Common::Callback<SavesSyncRequest, Networking::ErrorResponse>(this, &SavesSyncRequest::directoryListedErrorCallback)
new Common::Callback<SavesSyncRequest, const Storage::ListDirectoryResponse &>(this, &SavesSyncRequest::directoryListedCallback),
new Common::Callback<SavesSyncRequest, const Networking::ErrorResponse &>(this, &SavesSyncRequest::directoryListedErrorCallback)
);
if (!_workingRequest) finishError(Networking::ErrorResponse(this, "SavesSyncRequest::start: Storage couldn't create Request to list directory"));
}
void SavesSyncRequest::directoryListedCallback(Storage::ListDirectoryResponse response) {
void SavesSyncRequest::directoryListedCallback(const Storage::ListDirectoryResponse &response) {
_workingRequest = nullptr;
if (_ignoreCallback)
return;
@ -89,11 +89,11 @@ void SavesSyncRequest::directoryListedCallback(Storage::ListDirectoryResponse re
}
//determine which files to download and which files to upload
Common::Array<StorageFile> &remoteFiles = response.value;
const Common::Array<StorageFile> &remoteFiles = response.value;
uint64 totalSize = 0;
debug(9, "SavesSyncRequest decisions:");
for (uint32 i = 0; i < remoteFiles.size(); ++i) {
StorageFile &file = remoteFiles[i];
const StorageFile &file = remoteFiles[i];
if (file.isDirectory())
continue;
totalSize += file.size();
@ -170,7 +170,7 @@ void SavesSyncRequest::directoryListedCallback(Storage::ListDirectoryResponse re
}
}
void SavesSyncRequest::directoryListedErrorCallback(Networking::ErrorResponse error) {
void SavesSyncRequest::directoryListedErrorCallback(const Networking::ErrorResponse &error) {
_workingRequest = nullptr;
if (_ignoreCallback)
return;
@ -239,14 +239,14 @@ void SavesSyncRequest::directoryListedErrorCallback(Networking::ErrorResponse er
debug(9, "\nSavesSyncRequest: creating %s", dir.c_str());
_workingRequest = _storage->createDirectory(
dir,
new Common::Callback<SavesSyncRequest, Storage::BoolResponse>(this, &SavesSyncRequest::directoryCreatedCallback),
new Common::Callback<SavesSyncRequest, Networking::ErrorResponse>(this, &SavesSyncRequest::directoryCreatedErrorCallback)
new Common::Callback<SavesSyncRequest, const Storage::BoolResponse &>(this, &SavesSyncRequest::directoryCreatedCallback),
new Common::Callback<SavesSyncRequest, const Networking::ErrorResponse &>(this, &SavesSyncRequest::directoryCreatedErrorCallback)
);
if (!_workingRequest)
finishError(Networking::ErrorResponse(this, "SavesSyncRequest::directoryListedErrorCallback: Storage couldn't create Request to create remote directory"));
}
void SavesSyncRequest::directoryCreatedCallback(Storage::BoolResponse response) {
void SavesSyncRequest::directoryCreatedCallback(const Storage::BoolResponse &response) {
_workingRequest = nullptr;
if (_ignoreCallback)
return;
@ -262,7 +262,7 @@ void SavesSyncRequest::directoryCreatedCallback(Storage::BoolResponse response)
directoryListedCallback(Storage::ListDirectoryResponse(response.request, files));
}
void SavesSyncRequest::directoryCreatedErrorCallback(Networking::ErrorResponse error) {
void SavesSyncRequest::directoryCreatedErrorCallback(const Networking::ErrorResponse &error) {
_workingRequest = nullptr;
if (_ignoreCallback)
return;
@ -285,14 +285,14 @@ void SavesSyncRequest::downloadNextFile() {
_workingRequest = _storage->downloadById(
_currentDownloadingFile.id(),
DefaultSaveFileManager::concatWithSavesPath(_currentDownloadingFile.name()),
new Common::Callback<SavesSyncRequest, Storage::BoolResponse>(this, &SavesSyncRequest::fileDownloadedCallback),
new Common::Callback<SavesSyncRequest, Networking::ErrorResponse>(this, &SavesSyncRequest::fileDownloadedErrorCallback)
new Common::Callback<SavesSyncRequest, const Storage::BoolResponse &>(this, &SavesSyncRequest::fileDownloadedCallback),
new Common::Callback<SavesSyncRequest, const Networking::ErrorResponse &>(this, &SavesSyncRequest::fileDownloadedErrorCallback)
);
if (!_workingRequest)
finishError(Networking::ErrorResponse(this, "SavesSyncRequest::downloadNextFile: Storage couldn't create Request to download a file"));
}
void SavesSyncRequest::fileDownloadedCallback(Storage::BoolResponse response) {
void SavesSyncRequest::fileDownloadedCallback(const Storage::BoolResponse &response) {
_workingRequest = nullptr;
if (_ignoreCallback)
return;
@ -314,7 +314,7 @@ void SavesSyncRequest::fileDownloadedCallback(Storage::BoolResponse response) {
downloadNextFile();
}
void SavesSyncRequest::fileDownloadedErrorCallback(Networking::ErrorResponse error) {
void SavesSyncRequest::fileDownloadedErrorCallback(const Networking::ErrorResponse &error) {
_workingRequest = nullptr;
if (_ignoreCallback)
return;
@ -337,21 +337,21 @@ void SavesSyncRequest::uploadNextFile() {
_workingRequest = _storage->upload(
_storage->savesDirectoryPath() + _currentUploadingFile,
g_system->getSavefileManager()->openRawFile(_currentUploadingFile),
new Common::Callback<SavesSyncRequest, Storage::UploadResponse>(this, &SavesSyncRequest::fileUploadedCallback),
new Common::Callback<SavesSyncRequest, Networking::ErrorResponse>(this, &SavesSyncRequest::fileUploadedErrorCallback)
new Common::Callback<SavesSyncRequest, const Storage::UploadResponse &>(this, &SavesSyncRequest::fileUploadedCallback),
new Common::Callback<SavesSyncRequest, const Networking::ErrorResponse &>(this, &SavesSyncRequest::fileUploadedErrorCallback)
);
} else {
_workingRequest = _storage->upload(
_storage->savesDirectoryPath() + _currentUploadingFile,
DefaultSaveFileManager::concatWithSavesPath(_currentUploadingFile),
new Common::Callback<SavesSyncRequest, Storage::UploadResponse>(this, &SavesSyncRequest::fileUploadedCallback),
new Common::Callback<SavesSyncRequest, Networking::ErrorResponse>(this, &SavesSyncRequest::fileUploadedErrorCallback)
new Common::Callback<SavesSyncRequest, const Storage::UploadResponse &>(this, &SavesSyncRequest::fileUploadedCallback),
new Common::Callback<SavesSyncRequest, const Networking::ErrorResponse &>(this, &SavesSyncRequest::fileUploadedErrorCallback)
);
}
if (!_workingRequest) finishError(Networking::ErrorResponse(this, "SavesSyncRequest::uploadNextFile: Storage couldn't create Request to upload a file"));
}
void SavesSyncRequest::fileUploadedCallback(Storage::UploadResponse response) {
void SavesSyncRequest::fileUploadedCallback(const Storage::UploadResponse &response) {
_workingRequest = nullptr;
if (_ignoreCallback)
return;
@ -364,7 +364,7 @@ void SavesSyncRequest::fileUploadedCallback(Storage::UploadResponse response) {
uploadNextFile();
}
void SavesSyncRequest::fileUploadedErrorCallback(Networking::ErrorResponse error) {
void SavesSyncRequest::fileUploadedErrorCallback(const Networking::ErrorResponse &error) {
_workingRequest = nullptr;
if (_ignoreCallback)
return;
@ -446,7 +446,7 @@ uint32 SavesSyncRequest::getBytesToDownload() const {
return _bytesToDownload;
}
void SavesSyncRequest::finishError(Networking::ErrorResponse error, Networking::RequestState state) {
void SavesSyncRequest::finishError(const Networking::ErrorResponse &error, Networking::RequestState state) {
debug(9, "SavesSync::finishError");
//if we were downloading a file - remember the name
//and make the Request close() it, so we can delete it

24
backends/cloud/savessyncrequest.h
View File

@ -44,17 +44,17 @@ class SavesSyncRequest: public Networking::Request {
uint32 _bytesToDownload, _bytesDownloaded;
void start();
void directoryListedCallback(Storage::ListDirectoryResponse response);
void directoryListedErrorCallback(Networking::ErrorResponse error);
void directoryCreatedCallback(Storage::BoolResponse response);
void directoryCreatedErrorCallback(Networking::ErrorResponse error);
void fileDownloadedCallback(Storage::BoolResponse response);
void fileDownloadedErrorCallback(Networking::ErrorResponse error);
void fileUploadedCallback(Storage::UploadResponse response);
void fileUploadedErrorCallback(Networking::ErrorResponse error);
void directoryListedCallback(const Storage::ListDirectoryResponse &response);
void directoryListedErrorCallback(const Networking::ErrorResponse &error);
void directoryCreatedCallback(const Storage::BoolResponse &response);
void directoryCreatedErrorCallback(const Networking::ErrorResponse &error);
void fileDownloadedCallback(const Storage::BoolResponse &response);
void fileDownloadedErrorCallback(const Networking::ErrorResponse &error);
void fileUploadedCallback(const Storage::UploadResponse &response);
void fileUploadedErrorCallback(const Networking::ErrorResponse &error);
void downloadNextFile();
void uploadNextFile();
virtual void finishError(Networking::ErrorResponse error, Networking::RequestState state = Networking::FINISHED);
void finishError(const Networking::ErrorResponse &error, Networking::RequestState state = Networking::FINISHED) override;
void finishSync(bool success);
uint32 getDownloadedBytes() const;
@ -62,10 +62,10 @@ class SavesSyncRequest: public Networking::Request {
public:
SavesSyncRequest(Storage *storage, Storage::BoolCallback callback, Networking::ErrorCallback ecb);
virtual ~SavesSyncRequest();
~SavesSyncRequest() override;
virtual void handle();
virtual void restart();
void handle() override;
void restart() override;
/** Returns a number in range [0, 1], where 1 is "complete". */
double getDownloadingProgress() const;

32
backends/cloud/storage.cpp
View File

@ -46,10 +46,10 @@ void Storage::enable() {
}
Networking::ErrorCallback Storage::getErrorPrintingCallback() {
return new Common::Callback<Storage, Networking::ErrorResponse>(this, &Storage::printErrorResponse);
return new Common::Callback<Storage, const Networking::ErrorResponse &>(this, &Storage::printErrorResponse);
}
void Storage::printErrorResponse(Networking::ErrorResponse error) {
void Storage::printErrorResponse(const Networking::ErrorResponse &error) {
debug(9, "Storage: error response (%s, %ld):", (error.failed ? "failed" : "interrupted"), error.httpResponseCode);
debug(9, "%s", error.response.c_str());
}
@ -84,7 +84,7 @@ void Storage::requestFinishedCallback(Networking::Request *invalidRequestPointer
syncSaves(nullptr, nullptr);
}
Networking::Request *Storage::upload(Common::String remotePath, Common::String localPath, UploadCallback callback, Networking::ErrorCallback errorCallback) {
Networking::Request *Storage::upload(const Common::String &remotePath, const Common::String &localPath, UploadCallback callback, Networking::ErrorCallback errorCallback) {
if (!errorCallback) errorCallback = getErrorPrintingCallback();
Common::File *f = new Common::File();
@ -105,17 +105,17 @@ bool Storage::uploadStreamSupported() {
return true;
}
Networking::Request *Storage::streamFile(Common::String path, Networking::NetworkReadStreamCallback callback, Networking::ErrorCallback errorCallback) {
Networking::Request *Storage::streamFile(const Common::String &path, Networking::NetworkReadStreamCallback callback, Networking::ErrorCallback errorCallback) {
//most Storages use paths instead of ids, so this should work
return streamFileById(path, callback, errorCallback);
}
Networking::Request *Storage::download(Common::String remotePath, Common::String localPath, BoolCallback callback, Networking::ErrorCallback errorCallback) {
Networking::Request *Storage::download(const Common::String &remotePath, const Common::String &localPath, BoolCallback callback, Networking::ErrorCallback errorCallback) {
//most Storages use paths instead of ids, so this should work
return downloadById(remotePath, localPath, callback, errorCallback);
}
Networking::Request *Storage::downloadById(Common::String remoteId, Common::String localPath, BoolCallback callback, Networking::ErrorCallback errorCallback) {
Networking::Request *Storage::downloadById(const Common::String &remoteId, const Common::String &localPath, BoolCallback callback, Networking::ErrorCallback errorCallback) {
if (!errorCallback) errorCallback = getErrorPrintingCallback();
Common::DumpFile *f = new Common::DumpFile();
@ -131,7 +131,7 @@ Networking::Request *Storage::downloadById(Common::String remoteId, Common::Stri
return addRequest(new DownloadRequest(this, callback, errorCallback, remoteId, f));
}
Networking::Request *Storage::downloadFolder(Common::String remotePath, Common::String localPath, FileArrayCallback callback, Networking::ErrorCallback errorCallback, bool recursive) {
Networking::Request *Storage::downloadFolder(const Common::String &remotePath, const Common::String &localPath, FileArrayCallback callback, Networking::ErrorCallback errorCallback, bool recursive) {
if (!_isEnabled) {
warning("Storage::downloadFolder: cannot be run while Storage is disabled");
if (errorCallback)
@ -159,9 +159,9 @@ SavesSyncRequest *Storage::syncSaves(BoolCallback callback, Networking::ErrorCal
return _savesSyncRequest;
}
if (!callback)
callback = new Common::Callback<Storage, BoolResponse>(this, &Storage::savesSyncDefaultCallback);
callback = new Common::Callback<Storage, const BoolResponse &>(this, &Storage::savesSyncDefaultCallback);
if (!errorCallback)
errorCallback = new Common::Callback<Storage, Networking::ErrorResponse>(this, &Storage::savesSyncDefaultErrorCallback);
errorCallback = new Common::Callback<Storage, const Networking::ErrorResponse &>(this, &Storage::savesSyncDefaultErrorCallback);
_savesSyncRequest = new SavesSyncRequest(this, callback, errorCallback);
_syncRestartRequestsed = false;
_runningRequestsMutex.unlock();
@ -226,7 +226,7 @@ void Storage::cancelSync() {
_runningRequestsMutex.unlock();
}
void Storage::savesSyncDefaultCallback(BoolResponse response) {
void Storage::savesSyncDefaultCallback(const BoolResponse &response) {
_runningRequestsMutex.lock();
_savesSyncRequest = nullptr;
_runningRequestsMutex.unlock();
@ -235,7 +235,7 @@ void Storage::savesSyncDefaultCallback(BoolResponse response) {
warning("SavesSyncRequest called success callback with `false` argument");
}
void Storage::savesSyncDefaultErrorCallback(Networking::ErrorResponse error) {
void Storage::savesSyncDefaultErrorCallback(const Networking::ErrorResponse &error) {
_runningRequestsMutex.lock();
_savesSyncRequest = nullptr;
_runningRequestsMutex.unlock();
@ -250,7 +250,7 @@ void Storage::savesSyncDefaultErrorCallback(Networking::ErrorResponse error) {
///// DownloadFolderRequest-related /////
bool Storage::startDownload(Common::String remotePath, Common::String localPath) {
bool Storage::startDownload(const Common::String &remotePath, const Common::String &localPath) {
_runningRequestsMutex.lock();
if (_downloadFolderRequest) {
warning("Storage::startDownload: there is a download in progress already");
@ -259,8 +259,8 @@ bool Storage::startDownload(Common::String remotePath, Common::String localPath)
}
_downloadFolderRequest = (FolderDownloadRequest *)downloadFolder(
remotePath, localPath,
new Common::Callback<Storage, FileArrayResponse>(this, &Storage::directoryDownloadedCallback),
new Common::Callback<Storage, Networking::ErrorResponse>(this, &Storage::directoryDownloadedErrorCallback),
new Common::Callback<Storage, const FileArrayResponse &>(this, &Storage::directoryDownloadedCallback),
new Common::Callback<Storage, const Networking::ErrorResponse &>(this, &Storage::directoryDownloadedErrorCallback),
true
);
_runningRequestsMutex.unlock();
@ -342,7 +342,7 @@ Common::String Storage::getDownloadLocalDirectory() {
return result;
}
void Storage::directoryDownloadedCallback(FileArrayResponse response) {
void Storage::directoryDownloadedCallback(const FileArrayResponse &response) {
_runningRequestsMutex.lock();
_downloadFolderRequest = nullptr;
_runningRequestsMutex.unlock();
@ -356,7 +356,7 @@ void Storage::directoryDownloadedCallback(FileArrayResponse response) {
Common::OSDMessageQueue::instance().addMessage(message);
}
void Storage::directoryDownloadedErrorCallback(Networking::ErrorResponse error) {
void Storage::directoryDownloadedErrorCallback(const Networking::ErrorResponse &error) {
_runningRequestsMutex.lock();
_downloadFolderRequest = nullptr;
_runningRequestsMutex.unlock();

50
backends/cloud/storage.h
View File

@ -45,17 +45,17 @@ class FolderDownloadRequest;
class Storage {
public:
typedef Networking::Response<Common::Array<StorageFile>&> FileArrayResponse;
typedef Networking::Response<StorageInfo> StorageInfoResponse;
typedef Networking::Response<const Common::Array<StorageFile> &> FileArrayResponse;
typedef Networking::Response<const StorageInfo &> StorageInfoResponse;
typedef Networking::Response<bool> BoolResponse;
typedef Networking::Response<StorageFile> UploadResponse;
typedef Networking::Response<Common::Array<StorageFile> &> ListDirectoryResponse;
typedef Networking::Response<const StorageFile &> UploadResponse;
typedef Networking::Response<const Common::Array<StorageFile> &> ListDirectoryResponse;
typedef Common::BaseCallback<FileArrayResponse> *FileArrayCallback;
typedef Common::BaseCallback<StorageInfoResponse> *StorageInfoCallback;
typedef Common::BaseCallback<BoolResponse> *BoolCallback;
typedef Common::BaseCallback<UploadResponse> *UploadCallback;
typedef Common::BaseCallback<ListDirectoryResponse> *ListDirectoryCallback;
typedef Common::BaseCallback<const FileArrayResponse &> *FileArrayCallback;
typedef Common::BaseCallback<const StorageInfoResponse &> *StorageInfoCallback;
typedef Common::BaseCallback<const BoolResponse &> *BoolCallback;
typedef Common::BaseCallback<const UploadResponse &> *UploadCallback;
typedef Common::BaseCallback<const ListDirectoryResponse &> *ListDirectoryCallback;
protected:
/** Keeps track of running requests. */
@ -76,7 +76,7 @@ protected:
virtual Networking::ErrorCallback getErrorPrintingCallback();
/** Prints ErrorResponse contents with debug(). */
virtual void printErrorResponse(Networking::ErrorResponse error);
virtual void printErrorResponse(const Networking::ErrorResponse &error);
/**
* Adds request to the ConnMan, but also increases _runningRequestsCount.
@ -109,7 +109,7 @@ public:
* @note every Storage must write keyPrefix + "type" key
* with common value (e.g. "Dropbox").
*/
virtual void saveConfig(Common::String keyPrefix) = 0;
virtual void saveConfig(const Common::String &keyPrefix) = 0;
/**
* Return unique storage name.
@ -136,31 +136,31 @@ public:
*/
/** Returns ListDirectoryResponse with list of files. */
virtual Networking::Request *listDirectory(Common::String path, ListDirectoryCallback callback, Networking::ErrorCallback errorCallback, bool recursive = false) = 0;
virtual Networking::Request *listDirectory(const Common::String &path, ListDirectoryCallback callback, Networking::ErrorCallback errorCallback, bool recursive = false) = 0;
/** Returns StorageFile with info about uploaded file. */
virtual Networking::Request *upload(Common::String path, Common::SeekableReadStream *contents, UploadCallback callback, Networking::ErrorCallback errorCallback) = 0;
virtual Networking::Request *upload(Common::String remotePath, Common::String localPath, UploadCallback callback, Networking::ErrorCallback errorCallback);
virtual Networking::Request *upload(const Common::String &path, Common::SeekableReadStream *contents, UploadCallback callback, Networking::ErrorCallback errorCallback) = 0;
virtual Networking::Request *upload(const Common::String &remotePath, const Common::String &localPath, UploadCallback callback, Networking::ErrorCallback errorCallback);
/** Returns whether Storage supports upload(ReadStream). */
virtual bool uploadStreamSupported();
/** Returns pointer to Networking::NetworkReadStream. */
virtual Networking::Request *streamFile(Common::String path, Networking::NetworkReadStreamCallback callback, Networking::ErrorCallback errorCallback);
virtual Networking::Request *streamFileById(Common::String id, Networking::NetworkReadStreamCallback callback, Networking::ErrorCallback errorCallback) = 0;
virtual Networking::Request *streamFile(const Common::String &path, Networking::NetworkReadStreamCallback callback, Networking::ErrorCallback errorCallback);
virtual Networking::Request *streamFileById(const Common::String &id, Networking::NetworkReadStreamCallback callback, Networking::ErrorCallback errorCallback) = 0;
/** Calls the callback when finished. */
virtual Networking::Request *download(Common::String remotePath, Common::String localPath, BoolCallback callback, Networking::ErrorCallback errorCallback);
virtual Networking::Request *downloadById(Common::String remoteId, Common::String localPath, BoolCallback callback, Networking::ErrorCallback errorCallback);
virtual Networking::Request *download(const Common::String &remotePath, const Common::String &localPath, BoolCallback callback, Networking::ErrorCallback errorCallback);
virtual Networking::Request *downloadById(const Common::String &remoteId, const Common::String &localPath, BoolCallback callback, Networking::ErrorCallback errorCallback);
/** Returns Common::Array<StorageFile> with list of files, which were not downloaded. */
virtual Networking::Request *downloadFolder(Common::String remotePath, Common::String localPath, FileArrayCallback callback, Networking::ErrorCallback errorCallback, bool recursive = false);
virtual Networking::Request *downloadFolder(const Common::String &remotePath, const Common::String &localPath, FileArrayCallback callback, Networking::ErrorCallback errorCallback, bool recursive = false);
/** Calls the callback when finished. */
virtual SavesSyncRequest *syncSaves(BoolCallback callback, Networking::ErrorCallback errorCallback);
/** Calls the callback when finished. */
virtual Networking::Request *createDirectory(Common::String path, BoolCallback callback, Networking::ErrorCallback errorCallback) = 0;
virtual Networking::Request *createDirectory(const Common::String &path, BoolCallback callback, Networking::ErrorCallback errorCallback) = 0;
/**
* Returns the StorageInfo struct via <callback>.
@ -205,16 +205,16 @@ public:
protected:
/** Finishes the sync. Shows an OSD message. */
virtual void savesSyncDefaultCallback(BoolResponse response);
virtual void savesSyncDefaultCallback(const BoolResponse &response);
/** Finishes the sync. Shows an OSD message. */
virtual void savesSyncDefaultErrorCallback(Networking::ErrorResponse error);
virtual void savesSyncDefaultErrorCallback(const Networking::ErrorResponse &error);
public:
///// DownloadFolderRequest-related /////
/** Starts a folder download. */
virtual bool startDownload(Common::String remotePath, Common::String localPath);
virtual bool startDownload(const Common::String &remotePath, const Common::String &localPath);
/** Cancels running download. */
virtual void cancelDownload();
@ -245,10 +245,10 @@ public:
protected:
/** Finishes the download. Shows an OSD message. */
virtual void directoryDownloadedCallback(FileArrayResponse response);
virtual void directoryDownloadedCallback(const FileArrayResponse &response);
/** Finishes the download. Shows an OSD message. */
virtual void directoryDownloadedErrorCallback(Networking::ErrorResponse error);
virtual void directoryDownloadedErrorCallback(const Networking::ErrorResponse &error);
};
} // End of namespace Cloud

4
backends/cloud/storagefile.cpp
View File

@ -32,7 +32,7 @@ StorageFile::StorageFile() {
_isDirectory = false;
}
StorageFile::StorageFile(Common::String pth, uint32 sz, uint32 ts, bool dir) {
StorageFile::StorageFile(const Common::String &pth, uint32 sz, uint32 ts, bool dir) {
_id = pth;
_path = pth;
@ -55,7 +55,7 @@ StorageFile::StorageFile(Common::String pth, uint32 sz, uint32 ts, bool dir) {
_isDirectory = dir;
}
StorageFile::StorageFile(Common::String fileId, Common::String filePath, Common::String fileName, uint32 sz, uint32 ts, bool dir) {
StorageFile::StorageFile(const Common::String &fileId, const Common::String &filePath, const Common::String &fileName, uint32 sz, uint32 ts, bool dir) {
_id = fileId;
_path = filePath;
_name = fileName;

6
backends/cloud/storagefile.h
View File

@ -46,8 +46,8 @@ class StorageFile {
public:
StorageFile(); //invalid empty file
StorageFile(Common::String pth, uint32 sz, uint32 ts, bool dir);
StorageFile(Common::String fileId, Common::String filePath, Common::String fileName, uint32 sz, uint32 ts, bool dir);
StorageFile(const Common::String &pth, uint32 sz, uint32 ts, bool dir);
StorageFile(const Common::String &fileId, const Common::String &filePath, const Common::String &fileName, uint32 sz, uint32 ts, bool dir);
Common::String id() const { return _id; }
Common::String path() const { return _path; }
@ -56,7 +56,7 @@ public:
uint32 timestamp() const { return _timestamp; }
bool isDirectory() const { return _isDirectory; }
void setPath(Common::String path_) { _path = path_; }
void setPath(const Common::String &path_) { _path = path_; }
};
} // End of namespace Cloud

2
backends/cloud/storageinfo.h
View File

@ -36,7 +36,7 @@ class StorageInfo {
uint64 _usedBytes, _allocatedBytes;
public:
StorageInfo(Common::String uid_, Common::String name_, Common::String email_, uint64 used_, uint64 allocated):
StorageInfo(const Common::String &uid_, const Common::String &name_, const Common::String &email_, uint64 used_, uint64 allocated):
_uid(uid_), _name(name_), _email(email_), _usedBytes(used_), _allocatedBytes(allocated) {}
Common::String uid() const { return _uid; }

2
backends/networking/curl/connectionmanager.cpp
View File

@ -100,7 +100,7 @@ Request *ConnectionManager::addRequest(Request *request, RequestCallback callbac
return request;
}
Common::String ConnectionManager::urlEncode(Common::String s) const {
Common::String ConnectionManager::urlEncode(const Common::String &s) const {
if (!_multi)
return "";
#if LIBCURL_VERSION_NUM >= 0x070F04

4
backends/networking/curl/connectionmanager.h
View File

@ -89,7 +89,7 @@ class ConnectionManager : public Common::Singleton<ConnectionManager> {
public:
ConnectionManager();
virtual ~ConnectionManager();
~ConnectionManager() override;
/**
* All libcurl transfers are going through this ConnectionManager.
@ -114,7 +114,7 @@ public:
Request *addRequest(Request *request, RequestCallback callback = nullptr);
/** Return URL-encoded version of given string. */
Common::String urlEncode(Common::String s) const;
Common::String urlEncode(const Common::String &s) const;
static uint32 getCloudRequestsPeriodInMicroseconds();

18
backends/networking/curl/curljsonrequest.cpp
View File

@ -30,7 +30,7 @@
namespace Networking {
CurlJsonRequest::CurlJsonRequest(JsonCallback cb, ErrorCallback ecb, Common::String url) :
CurlJsonRequest::CurlJsonRequest(JsonCallback cb, ErrorCallback ecb, const Common::String &url) :
CurlRequest(nullptr, ecb, url), _jsonCallback(cb), _contentsStream(DisposeAfterUse::YES),
_buffer(new byte[CURL_JSON_REQUEST_BUFFER_SIZE]) {}
@ -71,7 +71,7 @@ void CurlJsonRequest::restart() {
//with no stream available next handle() will create another one
}
void CurlJsonRequest::finishJson(Common::JSONValue *json) {
void CurlJsonRequest::finishJson(const Common::JSONValue *json) {
Request::finishSuccess();
if (_jsonCallback)
(*_jsonCallback)(JsonResponse(this, json)); //potential memory leak, free it in your callbacks!
@ -79,7 +79,7 @@ void CurlJsonRequest::finishJson(Common::JSONValue *json) {
delete json;
}
bool CurlJsonRequest::jsonIsObject(Common::JSONValue *item, const char *warningPrefix) {
bool CurlJsonRequest::jsonIsObject(const Common::JSONValue *item, const char *warningPrefix) {
if (item == nullptr) {
warning("%s: passed item is NULL", warningPrefix);
return false;
@ -92,7 +92,7 @@ bool CurlJsonRequest::jsonIsObject(Common::JSONValue *item, const char *warningP
return false;
}
bool CurlJsonRequest::jsonContainsObject(Common::JSONObject &item, const char *key, const char *warningPrefix, bool isOptional) {
bool CurlJsonRequest::jsonContainsObject(const Common::JSONObject &item, const char *key, const char *warningPrefix, bool isOptional) {
if (!item.contains(key)) {
if (isOptional) {
return true;
@ -109,7 +109,7 @@ bool CurlJsonRequest::jsonContainsObject(Common::JSONObject &item, const char *k
return false;
}
bool CurlJsonRequest::jsonContainsString(Common::JSONObject &item, const char *key, const char *warningPrefix, bool isOptional) {
bool CurlJsonRequest::jsonContainsString(const Common::JSONObject &item, const char *key, const char *warningPrefix, bool isOptional) {
if (!item.contains(key)) {
if (isOptional) {
return true;
@ -126,7 +126,7 @@ bool CurlJsonRequest::jsonContainsString(Common::JSONObject &item, const char *k
return false;
}
bool CurlJsonRequest::jsonContainsIntegerNumber(Common::JSONObject &item, const char *key, const char *warningPrefix, bool isOptional) {
bool CurlJsonRequest::jsonContainsIntegerNumber(const Common::JSONObject &item, const char *key, const char *warningPrefix, bool isOptional) {
if (!item.contains(key)) {
if (isOptional) {
return true;
@ -143,7 +143,7 @@ bool CurlJsonRequest::jsonContainsIntegerNumber(Common::JSONObject &item, const
return false;
}
bool CurlJsonRequest::jsonContainsArray(Common::JSONObject &item, const char *key, const char *warningPrefix, bool isOptional) {
bool CurlJsonRequest::jsonContainsArray(const Common::JSONObject &item, const char *key, const char *warningPrefix, bool isOptional) {
if (!item.contains(key)) {
if (isOptional) {
return true;
@ -160,7 +160,7 @@ bool CurlJsonRequest::jsonContainsArray(Common::JSONObject &item, const char *ke
return false;
}
bool CurlJsonRequest::jsonContainsStringOrIntegerNumber(Common::JSONObject &item, const char *key, const char *warningPrefix, bool isOptional) {
bool CurlJsonRequest::jsonContainsStringOrIntegerNumber(const Common::JSONObject &item, const char *key, const char *warningPrefix, bool isOptional) {
if (!item.contains(key)) {
if (isOptional) {
return true;
@ -177,7 +177,7 @@ bool CurlJsonRequest::jsonContainsStringOrIntegerNumber(Common::JSONObject &item
return false;
}
bool CurlJsonRequest::jsonContainsAttribute(Common::JSONObject &item, const char *key, const char *warningPrefix, bool isOptional) {
bool CurlJsonRequest::jsonContainsAttribute(const Common::JSONObject &item, const char *key, const char *warningPrefix, bool isOptional) {
if (!item.contains(key)) {
if (isOptional) {
return true;

30
backends/networking/curl/curljsonrequest.h
View File

@ -28,9 +28,9 @@
namespace Networking {
typedef Response<Common::JSONValue *> JsonResponse;
typedef Common::BaseCallback<JsonResponse> *JsonCallback;
typedef Common::BaseCallback<Common::JSONValue *> *JSONValueCallback;
typedef Response<const Common::JSONValue *> JsonResponse;
typedef Common::BaseCallback<const JsonResponse &> *JsonCallback;
typedef Common::BaseCallback<const Common::JSONValue *> *JSONValueCallback;
#define CURL_JSON_REQUEST_BUFFER_SIZE 512 * 1024
@ -41,22 +41,22 @@ protected:
byte *_buffer;
/** Sets FINISHED state and passes the JSONValue * into user's callback in JsonResponse. */
virtual void finishJson(Common::JSONValue *json);
virtual void finishJson(const Common::JSONValue *json);
public:
CurlJsonRequest(JsonCallback cb, ErrorCallback ecb, Common::String url);
virtual ~CurlJsonRequest();
CurlJsonRequest(JsonCallback cb, ErrorCallback ecb, const Common::String &url);
~CurlJsonRequest() override;
virtual void handle();
virtual void restart();
void handle() override;
void restart() override;
static bool jsonIsObject(Common::JSONValue *item, const char *warningPrefix);
static bool jsonContainsObject(Common::JSONObject &item, const char *key, const char *warningPrefix, bool isOptional = false);
static bool jsonContainsString(Common::JSONObject &item, const char *key, const char *warningPrefix, bool isOptional = false);
static bool jsonContainsIntegerNumber(Common::JSONObject &item, const char *key, const char *warningPrefix, bool isOptional = false);
static bool jsonContainsArray(Common::JSONObject &item, const char *key, const char *warningPrefix, bool isOptional = false);
static bool jsonContainsStringOrIntegerNumber(Common::JSONObject &item, const char *key, const char *warningPrefix, bool isOptional = false);
static bool jsonContainsAttribute(Common::JSONObject &item, const char *key, const char *warningPrefix, bool isOptional = false);
static bool jsonIsObject(const Common::JSONValue *item, const char *warningPrefix);
static bool jsonContainsObject(const Common::JSONObject &item, const char *key, const char *warningPrefix, bool isOptional = false);
static bool jsonContainsString(const Common::JSONObject &item, const char *key, const char *warningPrefix, bool isOptional = false);
static bool jsonContainsIntegerNumber(const Common::JSONObject &item, const char *key, const char *warningPrefix, bool isOptional = false);
static bool jsonContainsArray(const Common::JSONObject &item, const char *key, const char *warningPrefix, bool isOptional = false);
static bool jsonContainsStringOrIntegerNumber(const Common::JSONObject &item, const char *key, const char *warningPrefix, bool isOptional = false);
static bool jsonContainsAttribute(const Common::JSONObject &item, const char *key, const char *warningPrefix, bool isOptional = false);
};
} // End of namespace Networking

12
backends/networking/curl/curlrequest.cpp
View File

@ -29,7 +29,7 @@
namespace Networking {
CurlRequest::CurlRequest(DataCallback cb, ErrorCallback ecb, Common::String url):
CurlRequest::CurlRequest(DataCallback cb, ErrorCallback ecb, const Common::String &url):
Request(cb, ecb), _url(url), _stream(nullptr), _headersList(nullptr), _bytesBuffer(nullptr),
_bytesBufferSize(0), _uploading(false), _usingPatch(false), _keepAlive(false), _keepAliveIdle(120), _keepAliveInterval(60) {}
@ -78,18 +78,18 @@ Common::String CurlRequest::date() const {
return "";
}
void CurlRequest::setHeaders(Common::Array<Common::String> &headers) {
void CurlRequest::setHeaders(const Common::Array<Common::String> &headers) {
curl_slist_free_all(_headersList);
_headersList = nullptr;
for (uint32 i = 0; i < headers.size(); ++i)
addHeader(headers[i]);
}
void CurlRequest::addHeader(Common::String header) {
void CurlRequest::addHeader(const Common::String &header) {
_headersList = curl_slist_append(_headersList, header.c_str());
}
void CurlRequest::addPostField(Common::String keyValuePair) {
void CurlRequest::addPostField(const Common::String &keyValuePair) {
if (_bytesBuffer)
warning("CurlRequest: added POST fields would be ignored, because there is buffer present");
@ -102,7 +102,7 @@ void CurlRequest::addPostField(Common::String keyValuePair) {
_postFields += "&" + keyValuePair;
}
void CurlRequest::addFormField(Common::String name, Common::String value) {
void CurlRequest::addFormField(const Common::String &name, const Common::String &value) {
if (_bytesBuffer)
warning("CurlRequest: added POST form fields would be ignored, because there is buffer present");
@ -112,7 +112,7 @@ void CurlRequest::addFormField(Common::String name, Common::String value) {
_formFields[name] = value;
}
void CurlRequest::addFormFile(Common::String name, Common::String filename) {
void CurlRequest::addFormFile(const Common::String &name, const Common::String &filename) {
if (_bytesBuffer)
warning("CurlRequest: added POST form files would be ignored, because there is buffer present");

24
backends/networking/curl/curlrequest.h
View File

@ -35,7 +35,7 @@ namespace Networking {
class NetworkReadStream;
typedef Response<NetworkReadStream *> NetworkReadStreamResponse;
typedef Common::BaseCallback<NetworkReadStreamResponse> *NetworkReadStreamCallback;
typedef Common::BaseCallback<const NetworkReadStreamResponse &> *NetworkReadStreamCallback;
class CurlRequest: public Request {
protected:
@ -52,30 +52,30 @@ protected:
bool _keepAlive;
long _keepAliveIdle, _keepAliveInterval;
virtual NetworkReadStream *makeStream();
NetworkReadStream *makeStream();
public:
CurlRequest(DataCallback cb, ErrorCallback ecb, Common::String url);
virtual ~CurlRequest();
CurlRequest(DataCallback cb, ErrorCallback ecb, const Common::String &url);
~CurlRequest() override;
virtual void handle();
virtual void restart();
virtual Common::String date() const;
void handle() override;
void restart() override;
Common::String date() const override;
/** Replaces all headers with the passed array of headers. */
virtual void setHeaders(Common::Array<Common::String> &headers);
virtual void setHeaders(const Common::Array<Common::String> &headers);
/** Adds a header into headers list. */
virtual void addHeader(Common::String header);
virtual void addHeader(const Common::String &header);
/** Adds a post field (key=value pair). */
virtual void addPostField(Common::String field);
virtual void addPostField(const Common::String &field);
/** Adds a form/multipart field (name, value). */
virtual void addFormField(Common::String name, Common::String value);
virtual void addFormField(const Common::String &name, const Common::String &value);
/** Adds a form/multipart file (field name, file name). */
virtual void addFormFile(Common::String name, Common::String filename);
virtual void addFormFile(const Common::String &name, const Common::String &filename);
/** Sets bytes buffer. */
virtual void setBuffer(byte *buffer, uint32 size);

10
backends/networking/curl/networkreadstream.cpp
View File

@ -158,7 +158,7 @@ void NetworkReadStream::setupBufferContents(const byte *buffer, uint32 bufferSiz
ConnMan.registerEasyHandle(_easy);
}
void NetworkReadStream::setupFormMultipart(Common::HashMap<Common::String, Common::String> formFields, Common::HashMap<Common::String, Common::String> formFiles) {
void NetworkReadStream::setupFormMultipart(const Common::HashMap<Common::String, Common::String> &formFields, const Common::HashMap<Common::String, Common::String> &formFiles) {
// set POST multipart upload form fields/files
struct curl_httppost *formpost = nullptr;
struct curl_httppost *lastptr = nullptr;
@ -193,13 +193,13 @@ void NetworkReadStream::setupFormMultipart(Common::HashMap<Common::String, Commo
ConnMan.registerEasyHandle(_easy);
}
NetworkReadStream::NetworkReadStream(const char *url, curl_slist *headersList, Common::String postFields, bool uploading, bool usingPatch, bool keepAlive, long keepAliveIdle, long keepAliveInterval):
NetworkReadStream::NetworkReadStream(const char *url, curl_slist *headersList, const Common::String &postFields, bool uploading, bool usingPatch, bool keepAlive, long keepAliveIdle, long keepAliveInterval):
_backingStream(DisposeAfterUse::YES), _keepAlive(keepAlive), _keepAliveIdle(keepAliveIdle), _keepAliveInterval(keepAliveInterval), _errorBuffer(nullptr), _errorCode(CURLE_OK) {
initCurl(url, headersList);
setupBufferContents((const byte *)postFields.c_str(), postFields.size(), uploading, usingPatch, false);
}
NetworkReadStream::NetworkReadStream(const char *url, curl_slist *headersList, Common::HashMap<Common::String, Common::String> formFields, Common::HashMap<Common::String, Common::String> formFiles, bool keepAlive, long keepAliveIdle, long keepAliveInterval):
NetworkReadStream::NetworkReadStream(const char *url, curl_slist *headersList, const Common::HashMap<Common::String, Common::String> &formFields, const Common::HashMap<Common::String, Common::String> &formFiles, bool keepAlive, long keepAliveIdle, long keepAliveInterval):
_backingStream(DisposeAfterUse::YES), _keepAlive(keepAlive), _keepAliveIdle(keepAliveIdle), _keepAliveInterval(keepAliveInterval), _errorBuffer(nullptr), _errorCode(CURLE_OK) {
initCurl(url, headersList);
setupFormMultipart(formFields, formFiles);
@ -211,7 +211,7 @@ NetworkReadStream::NetworkReadStream(const char *url, curl_slist *headersList, c
setupBufferContents(buffer, bufferSize, uploading, usingPatch, post);
}
bool NetworkReadStream::reuse(const char *url, curl_slist *headersList, Common::String postFields, bool uploading, bool usingPatch) {
bool NetworkReadStream::reuse(const char *url, curl_slist *headersList, const Common::String &postFields, bool uploading, bool usingPatch) {
if (!reuseCurl(url, headersList))
return false;
@ -220,7 +220,7 @@ bool NetworkReadStream::reuse(const char *url, curl_slist *headersList, Common::
return true;
}
bool NetworkReadStream::reuse(const char *url, curl_slist *headersList, Common::HashMap<Common::String, Common::String> formFields, Common::HashMap<Common::String, Common::String> formFiles) {
bool NetworkReadStream::reuse(const char *url, curl_slist *headersList, const Common::HashMap<Common::String, Common::String> &formFields, const Common::HashMap<Common::String, Common::String> &formFiles) {
if (!reuseCurl(url, headersList))
return false;

22
backends/networking/curl/networkreadstream.h
View File

@ -33,7 +33,7 @@ struct curl_slist;
namespace Networking {
class NetworkReadStream: public Common::ReadStream {
class NetworkReadStream : public Common::ReadStream {
CURL *_easy;
Common::MemoryReadWriteStream _backingStream;
bool _keepAlive;
@ -52,7 +52,7 @@ class NetworkReadStream: public Common::ReadStream {
void initCurl(const char *url, curl_slist *headersList);
bool reuseCurl(const char *url, curl_slist *headersList);
void setupBufferContents(const byte *buffer, uint32 bufferSize, bool uploading, bool usingPatch, bool post);
void setupFormMultipart(Common::HashMap<Common::String, Common::String> formFields, Common::HashMap<Common::String, Common::String> formFiles);
void setupFormMultipart(const Common::HashMap<Common::String, Common::String> &formFields, const Common::HashMap<Common::String, Common::String> &formFiles);
/**
* Fills the passed buffer with _sendingContentsBuffer contents.
@ -76,24 +76,24 @@ class NetworkReadStream: public Common::ReadStream {
static int curlProgressCallbackOlder(void *p, double dltotal, double dlnow, double ultotal, double ulnow);
public:
/** Send <postFields>, using POST by default. */
NetworkReadStream(const char *url, curl_slist *headersList, Common::String postFields, bool uploading = false, bool usingPatch = false, bool keepAlive = false, long keepAliveIdle = 120, long keepAliveInterval = 60);
NetworkReadStream(const char *url, curl_slist *headersList, const Common::String &postFields, bool uploading = false, bool usingPatch = false, bool keepAlive = false, long keepAliveIdle = 120, long keepAliveInterval = 60);
/** Send <formFields>, <formFiles>, using POST multipart/form. */
NetworkReadStream(
const char *url, curl_slist *headersList,
Common::HashMap<Common::String, Common::String> formFields,
Common::HashMap<Common::String, Common::String> formFiles,
const Common::HashMap<Common::String, Common::String> &formFields,
const Common::HashMap<Common::String, Common::String> &formFiles,
bool keepAlive = false, long keepAliveIdle = 120, long keepAliveInterval = 60);
/** Send <buffer>, using POST by default. */
NetworkReadStream(const char *url, curl_slist *headersList, const byte *buffer, uint32 bufferSize, bool uploading = false, bool usingPatch = false, bool post = true, bool keepAlive = false, long keepAliveIdle = 120, long keepAliveInterval = 60);
virtual ~NetworkReadStream();
~NetworkReadStream() override;
/** Send <postFields>, using POST by default. */
bool reuse(const char *url, curl_slist *headersList, Common::String postFields, bool uploading = false, bool usingPatch = false);
bool reuse(const char *url, curl_slist *headersList, const Common::String &postFields, bool uploading = false, bool usingPatch = false);
/** Send <formFields>, <formFiles>, using POST multipart/form. */
bool reuse(
const char *url, curl_slist *headersList,
Common::HashMap<Common::String, Common::String> formFields,
Common::HashMap<Common::String, Common::String> formFiles);
const Common::HashMap<Common::String, Common::String> &formFields,
const Common::HashMap<Common::String, Common::String> &formFiles);
/** Send <buffer>, using POST by default. */
bool reuse(const char *url, curl_slist *headersList, const byte *buffer, uint32 bufferSize, bool uploading = false, bool usingPatch = false, bool post = true);
@ -107,7 +107,7 @@ public:
* with N bytes, reading exactly N bytes from the start should *not*
* set eos; only reading *beyond* the available data should set it.
*/
virtual bool eos() const;
bool eos() const override;
/**
* Read data from the stream. Subclasses must implement this
@ -121,7 +121,7 @@ public:
* @param dataSize number of bytes to be read
* @return the number of bytes which were actually read.
*/
virtual uint32 read(void *dataPtr, uint32 dataSize);
uint32 read(void *dataPtr, uint32 dataSize) override;
/**
* This method is called by ConnectionManager to indicate

14
backends/networking/curl/postrequest.cpp
View File

@ -27,7 +27,7 @@
namespace Networking {
PostRequest::PostRequest(Common::String url, Networking::JSONValueCallback cb, Networking::ErrorCallback ecb):
PostRequest::PostRequest(const Common::String &url, Networking::JSONValueCallback cb, Networking::ErrorCallback ecb):
Networking::Request(nullptr, ecb), _url(url), _jsonCallback(cb),
_workingRequest(nullptr), _ignoreCallback(false), _postData(nullptr), _postLen(0), _jsonData(nullptr) {
@ -60,8 +60,8 @@ void PostRequest::start() {
_workingRequest->finish();
_ignoreCallback = false;
Networking::JsonCallback innerCallback = new Common::Callback<PostRequest, Networking::JsonResponse>(this, &PostRequest::responseCallback);
Networking::ErrorCallback errorResponseCallback = new Common::Callback<PostRequest, Networking::ErrorResponse>(this, &PostRequest::errorCallback);
Networking::JsonCallback innerCallback = new Common::Callback<PostRequest, const Networking::JsonResponse &>(this, &PostRequest::responseCallback);
Networking::ErrorCallback errorResponseCallback = new Common::Callback<PostRequest, const Networking::ErrorResponse &>(this, &PostRequest::errorCallback);
Networking::CurlJsonRequest *request = new Networking::CurlJsonRequest(innerCallback, errorResponseCallback, _url);
if (_postData && _jsonData) {
@ -82,8 +82,8 @@ void PostRequest::start() {
_workingRequest = ConnMan.addRequest(request);
}
void PostRequest::responseCallback(Networking::JsonResponse response) {
Common::JSONValue *json = response.value;
void PostRequest::responseCallback(const Networking::JsonResponse &response) {
const Common::JSONValue *json = response.value;
_workingRequest = nullptr;
if (_ignoreCallback) {
delete json;
@ -92,7 +92,7 @@ void PostRequest::responseCallback(Networking::JsonResponse response) {
if (response.request) _date = response.request->date();
Networking::ErrorResponse error(this, "PostRequest::responseCallback: unknown error");
Networking::CurlJsonRequest *rq = (Networking::CurlJsonRequest *)response.request;
const Networking::CurlJsonRequest *rq = (const Networking::CurlJsonRequest *)response.request;
if (rq && rq->getNetworkReadStream())
error.httpResponseCode = rq->getNetworkReadStream()->httpResponseCode();
@ -110,7 +110,7 @@ void PostRequest::responseCallback(Networking::JsonResponse response) {
delete json;
}
void PostRequest::errorCallback(Networking::ErrorResponse error) {
void PostRequest::errorCallback(const Networking::ErrorResponse &error) {
_workingRequest = nullptr;
if (_ignoreCallback)
return;

18
backends/networking/curl/postrequest.h
View File

@ -27,7 +27,7 @@
namespace Networking {
class PostRequest: public Networking::Request {
class PostRequest : public Networking::Request {
Common::String _url;
Networking::JSONValueCallback _jsonCallback;
Request *_workingRequest;
@ -40,22 +40,22 @@ class PostRequest: public Networking::Request {
Common::String _contentType;
void responseCallback(Networking::JsonResponse response);
void errorCallback(Networking::ErrorResponse error);
void responseCallback(const Networking::JsonResponse &response);
void errorCallback(const Networking::ErrorResponse &error);
public:
PostRequest(Common::String url, Networking::JSONValueCallback cb, Networking::ErrorCallback ecb);
virtual ~PostRequest();
PostRequest(const Common::String &url, Networking::JSONValueCallback cb, Networking::ErrorCallback ecb);
~PostRequest() override;
void start();
void setPostData(byte *postData, int postLen);
void setJSONData(Common::JSONValue *jsonData);
void setContentType(Common::String type) { _contentType = type; }
void setContentType(const Common::String &type) { _contentType = type; }
virtual void handle();
virtual void restart();
virtual Common::String date() const;
void handle() override;
void restart() override;
Common::String date() const override;
};
} // End of namespace Networking

6
backends/networking/curl/request.cpp
View File

@ -23,10 +23,10 @@
namespace Networking {
ErrorResponse::ErrorResponse(Request *rq, Common::String resp):
ErrorResponse::ErrorResponse(Request *rq, const Common::String &resp):
request(rq), interrupted(false), failed(true), response(resp), httpResponseCode(-1) {}
ErrorResponse::ErrorResponse(Request *rq, bool interrupt, bool failure, Common::String resp, long httpCode):
ErrorResponse::ErrorResponse(Request *rq, bool interrupt, bool failure, const Common::String &resp, long httpCode):
request(rq), interrupted(interrupt), failed(failure), response(resp), httpResponseCode(httpCode) {}
Request::Request(DataCallback cb, ErrorCallback ecb):
@ -62,7 +62,7 @@ RequestState Request::state() const { return _state; }
Common::String Request::date() const { return ""; }
void Request::finishError(ErrorResponse error, RequestState state) {
void Request::finishError(const ErrorResponse &error, RequestState state) {
_state = state;
if (_errorCallback)
(*_errorCallback)(error);

14
backends/networking/curl/request.h
View File

@ -45,10 +45,10 @@ class Request;
*/
template<typename T> struct Response {
Request *request;
const Request *request;
T value;
Response(Request *rq, T v) : request(rq), value(v) {}
Response(const Request *rq, T v) : request(rq), value(v) {}
};
/**
@ -77,13 +77,13 @@ struct ErrorResponse {
Common::String response;
long httpResponseCode;
ErrorResponse(Request *rq, Common::String resp);
ErrorResponse(Request *rq, bool interrupt, bool failure, Common::String resp, long httpCode);
ErrorResponse(Request *rq, const Common::String &resp);
ErrorResponse(Request *rq, bool interrupt, bool failure, const Common::String &resp, long httpCode);
};
typedef Response<void *> DataResponse;
typedef Common::BaseCallback<DataResponse> *DataCallback;
typedef Common::BaseCallback<ErrorResponse> *ErrorCallback;
typedef Common::BaseCallback<const DataResponse &> *DataCallback;
typedef Common::BaseCallback<const ErrorResponse &> *ErrorCallback;
/**
* RequestState is used to indicate current Request state.
@ -148,7 +148,7 @@ protected:
uint32 _retryInSeconds;
/** Sets FINISHED state and calls the _errorCallback with given error. */
virtual void finishError(ErrorResponse error, RequestState state = FINISHED);
virtual void finishError(const ErrorResponse &error, RequestState state = FINISHED);
/** Sets FINISHED state. Implementations might extend it if needed. */
virtual void finishSuccess();

16
backends/networking/curl/session.cpp
View File

@ -25,14 +25,14 @@
namespace Networking {
Session::Session(Common::String prefix):
Session::Session(const Common::String &prefix):
_prefix(prefix), _request(nullptr) {}
Session::~Session() {
close();
}
static Common::String constructUrl(Common::String prefix, Common::String url) {
static Common::String constructUrl(const Common::String &prefix, const Common::String &url) {
// check url prefix
if (!prefix.empty()) {
if (url.contains("://")) {
@ -46,17 +46,17 @@ static Common::String constructUrl(Common::String prefix, Common::String url) {
if (newUrl.lastChar() != '/' && (url.size() > 0 && url.firstChar() != '/'))
newUrl += "/";
newUrl += url;
url = newUrl;
return newUrl;
}
}
return url;
}
SessionRequest *Session::get(Common::String url, Common::String localFile, DataCallback cb, ErrorCallback ecb, bool binary) {
url = constructUrl(_prefix, url);
SessionRequest *Session::get(const Common::String &url, const Common::String &localFile, DataCallback cb, ErrorCallback ecb, bool binary) {
Common::String builtUrl = constructUrl(_prefix, url);
if (url.empty())
if (builtUrl.empty())
return nullptr;
// check if request has finished (ready to be replaced)
@ -68,10 +68,10 @@ SessionRequest *Session::get(Common::String url, Common::String localFile, DataC
}
if (!_request) {
_request = new SessionRequest(url, localFile, cb, ecb, binary); // automatically added to ConnMan
_request = new SessionRequest(builtUrl, localFile, cb, ecb, binary); // automatically added to ConnMan
_request->connectionKeepAlive();
} else {
_request->reuse(url, localFile, cb, ecb, binary);
_request->reuse(builtUrl, localFile, cb, ecb, binary);
}
return _request;

4
backends/networking/curl/session.h
View File

@ -32,10 +32,10 @@ protected:
SessionRequest *_request;
public:
Session(Common::String prefix = "");
Session(const Common::String &prefix = Common::String());
~Session();
SessionRequest *get(Common::String url, Common::String localFile, DataCallback cb = nullptr, ErrorCallback ecb = nullptr, bool binary = false);
SessionRequest *get(const Common::String &url, const Common::String &localFile, DataCallback cb = nullptr, ErrorCallback ecb = nullptr, bool binary = false);
/**
* @brief Gracefully close the session
*

8
backends/networking/curl/sessionrequest.cpp
View File

@ -31,7 +31,7 @@
namespace Networking {
SessionRequest::SessionRequest(Common::String url, Common::String localFile, DataCallback cb, ErrorCallback ecb, bool binary):
SessionRequest::SessionRequest(const Common::String &url, const Common::String &localFile, DataCallback cb, ErrorCallback ecb, bool binary):
CurlRequest(cb, ecb, url), _contentsStream(DisposeAfterUse::YES),
_buffer(new byte[CURL_SESSION_REQUEST_BUFFER_SIZE]), _text(nullptr), _localFile(nullptr),
_started(false), _complete(false), _success(false), _binary(binary) {
@ -48,7 +48,7 @@ SessionRequest::~SessionRequest() {
delete[] _buffer;
}
void SessionRequest::openLocalFile(Common::String localFile) {
void SessionRequest::openLocalFile(const Common::String &localFile) {
if (localFile.empty())
return;
@ -96,7 +96,7 @@ char *SessionRequest::getPreparedContents() {
return (char *)result;
}
void SessionRequest::finishError(ErrorResponse error, RequestState state) {
void SessionRequest::finishError(const ErrorResponse &error, RequestState state) {
_complete = true;
_success = false;
CurlRequest::finishError(error, PAUSED);
@ -137,7 +137,7 @@ void SessionRequest::startAndWait() {
wait();
}
void SessionRequest::reuse(Common::String url, Common::String localFile, DataCallback cb, ErrorCallback ecb, bool binary) {
void SessionRequest::reuse(const Common::String &url, const Common::String &localFile, DataCallback cb, ErrorCallback ecb, bool binary) {
_url = url;
delete _callback;

16
backends/networking/curl/sessionrequest.h
View File

@ -61,21 +61,21 @@ protected:
/** Prepares raw bytes from _contentsStream. */
char *getPreparedContents();
virtual void finishError(ErrorResponse error, RequestState state = PAUSED);
virtual void finishSuccess();
void openLocalFile(Common::String localFile);
void finishError(const ErrorResponse &error, RequestState state = PAUSED) override;
void finishSuccess() override;
void openLocalFile(const Common::String &localFile);
public:
SessionRequest(Common::String url, Common::String localFile, DataCallback cb = nullptr, ErrorCallback ecb = nullptr, bool binary = false);
virtual ~SessionRequest();
SessionRequest(const Common::String &url, const Common::String &localFile, DataCallback cb = nullptr, ErrorCallback ecb = nullptr, bool binary = false);
~SessionRequest() override;
void start();
void startAndWait();
void reuse(Common::String url, Common::String localFile, DataCallback cb = nullptr, ErrorCallback ecb = nullptr, bool binary = false);
void reuse(const Common::String &url, const Common::String &localFile, DataCallback cb = nullptr, ErrorCallback ecb = nullptr, bool binary = false);
virtual void handle();
virtual void restart();
void handle() override;
void restart() override;
/** This request DOES NOT delete automatically after calling callbacks. It gets PAUSED, and in order to make it FINISHED (i.e. delete), this method MUST be called. */
void close();

2
backends/networking/curl/socket.cpp
View File

@ -69,7 +69,7 @@ int CurlSocket::ready() {
return waitOnSocket(_socket, 1, 0);
}
bool CurlSocket::connect(Common::String url) {
bool CurlSocket::connect(const Common::String &url) {
_easy = curl_easy_init();
if (_easy) {
curl_easy_setopt(_easy, CURLOPT_URL, url.c_str());

2
backends/networking/curl/socket.h
View File

@ -42,7 +42,7 @@ public:
CurlSocket();
~CurlSocket();
bool connect(Common::String url);
bool connect(const Common::String &url);
int ready();

4
backends/networking/curl/url.cpp
View File

@ -48,7 +48,7 @@ int CurlURL::getPort(bool defaultPort) {
return -1;
}
bool CurlURL::parseURL(Common::String url) {
bool CurlURL::parseURL(const Common::String &url) {
warning("libcurl: curl_url requires curl 7.62.0 or later");
return false;
}
@ -62,7 +62,7 @@ CurlURL::~CurlURL() {
}
}
bool CurlURL::parseURL(Common::String url) {
bool CurlURL::parseURL(const Common::String &url) {
if (_url)
curl_url_cleanup(_url);

2
backends/networking/curl/url.h
View File

@ -38,7 +38,7 @@ public:
* @retval true if successful.
* @retval false on failure or if using an older version of libcurl.
*/
bool parseURL(Common::String url);
bool parseURL(const Common::String &url);
/**
* Extracts the scheme of an URL parsed previously by parseURL.

8
backends/networking/enet/enet.cpp
View File

@ -55,7 +55,7 @@ bool ENet::initialize() {
return true;
}
Host *ENet::createHost(Common::String address, int port, int numClients, int numChannels, int incBand, int outBand) {
Host *ENet::createHost(const Common::String &address, int port, int numClients, int numChannels, int incBand, int outBand) {
ENetAddress enetAddress;
// NOTE: 0.0.0.0 returns ENET_HOST_ANY normally.
enet_address_set_host(&enetAddress, address.c_str());
@ -70,7 +70,7 @@ Host *ENet::createHost(Common::String address, int port, int numClients, int num
return new Host(_host);
}
Host *ENet::connectToHost(Common::String hostAddress, int hostPort, Common::String address, int port, int timeout, int numChannels, int incBand, int outBand) {
Host *ENet::connectToHost(const Common::String &hostAddress, int hostPort, const Common::String &address, int port, int timeout, int numChannels, int incBand, int outBand) {
ENetAddress enetHostAddress;
// NOTE: 0.0.0.0 returns ENET_HOST_ANY normally.
enet_address_set_host(&enetHostAddress, hostAddress.c_str());
@ -106,11 +106,11 @@ Host *ENet::connectToHost(Common::String hostAddress, int hostPort, Common::Stri
return nullptr;
}
Host *ENet::connectToHost(Common::String address, int port, int timeout, int numChannels, int incBand, int outBand) {
Host *ENet::connectToHost(const Common::String &address, int port, int timeout, int numChannels, int incBand, int outBand) {
return connectToHost("0.0.0.0", 0, address, port, timeout, numChannels, incBand, outBand);
}
Socket *ENet::createSocket(Common::String address, int port) {
Socket *ENet::createSocket(const Common::String &address, int port) {
ENetAddress enetAddress;
if (address == "255.255.255.255") {
enetAddress.host = ENET_HOST_BROADCAST;

8
backends/networking/enet/enet.h
View File

@ -54,7 +54,7 @@ public:
* @retval nullptr on failure
* @see Networking::Host
*/
Host *createHost(Common::String address, int port, int numClients, int numChannels = 1, int incBand = 0, int outBand = 0);
Host *createHost(const Common::String &address, int port, int numClients, int numChannels = 1, int incBand = 0, int outBand = 0);
/**
* Creates a new ENet Host instance, and attempts to connect to the assigned address and port.
* @param hostAddress the address this host will use to connect to this peer. "0.0.0.0" may be to used to use the default host.
@ -69,8 +69,8 @@ public:
* @retval nullptr on failure
* @see Networking::Host
*/
Host *connectToHost(Common::String hostAddress, int hostPort, Common::String address, int port, int timeout = 5000, int numChannels = 1, int incBand = 0, int outBand = 0);
Host *connectToHost(Common::String address, int port, int timeout = 5000, int numChannels = 1, int incBand = 0, int outBand = 0);
Host *connectToHost(const Common::String &hostAddress, int hostPort, const Common::String &address, int port, int timeout = 5000, int numChannels = 1, int incBand = 0, int outBand = 0);
Host *connectToHost(const Common::String &address, int port, int timeout = 5000, int numChannels = 1, int incBand = 0, int outBand = 0);
/**
* Creates a Networking::Socket instance which is a representation of a raw UDP socket.
* Useful for and sending and receiving data that is outside the ENet library protocol.
@ -80,7 +80,7 @@ public:
* @retval nullptr on failure
* @see Networking::Socket
*/
Socket *createSocket(Common::String address, int port);
Socket *createSocket(const Common::String &address, int port);
private:
/**
* Indicates if the ENet library has successfully initialized or not.

6
backends/networking/enet/host.cpp
View File

@ -67,7 +67,7 @@ uint8 Host::service(int timeout) {
return event.type;
}
bool Host::connectPeer(Common::String address, int port, int timeout, int numChannels) {
bool Host::connectPeer(const Common::String &address, int port, int timeout, int numChannels) {
ENetAddress enetAddress;
if (address == "255.255.255.255") {
enetAddress.host = ENET_HOST_BROADCAST;
@ -121,7 +121,7 @@ int Host::getPort() {
return _recentPort;
}
int Host::getPeerIndexFromHost(Common::String host, int port) {
int Host::getPeerIndexFromHost(const Common::String &host, int port) {
for (int i = 0; i < (int)_host->peerCount; i++) {
char hostName[50];
if (enet_address_get_host_ip(&_host->peers[i].address, hostName, 50) == 0) {
@ -165,7 +165,7 @@ bool Host::send(const char *data, int peerIndex, int channel, bool reliable) {
return true;
}
bool Host::sendRawData(Common::String address, int port, const char *data) {
bool Host::sendRawData(const Common::String &address, int port, const char *data) {
ENetAddress enetAddress;
if (address == "255.255.255.255") {
enetAddress.host = ENET_HOST_BROADCAST;

6
backends/networking/enet/host.h
View File

@ -77,7 +77,7 @@ public:
* @retval true on successful.
* @retval false on failure.
*/
bool connectPeer(Common::String address, int port, int timeout = 5000, int numChannels = 1);
bool connectPeer(const Common::String &address, int port, int timeout = 5000, int numChannels = 1);
/**
* Disconnects a specific peer from the host.
* @param peerIndex Index of a peer to disconnect.
@ -106,7 +106,7 @@ public:
* @note This sends data as a raw connection-less UDP socket, the same functionaility as a Networking::Socket object, but retains the address and port this host object is using.
* @note Useful for hole-punching a peer, so it can connect to it.
*/
bool sendRawData(Common::String address, int port, const char *data);
bool sendRawData(const Common::String &address, int port, const char *data);
/**
* Gets the host name of a peer that have recently connected, disconnected or received packet from.
@ -128,7 +128,7 @@ public:
* @retval >= 0 containing a peer index if successfully found.
* @retval -1 if not found.
*/
int getPeerIndexFromHost(Common::String host, int port);
int getPeerIndexFromHost(const Common::String &host, int port);
/**
* Gets the data from the most-recently received packet.

2
backends/networking/enet/socket.cpp
View File

@ -37,7 +37,7 @@ Socket::~Socket() {
enet_socket_destroy(_socket);
}
bool Socket::send(Common::String address, int port, const char *data) {
bool Socket::send(const Common::String &address, int port, const char *data) {
ENetAddress enetAddress;
if (address == "255.255.255.255") {
enetAddress.host = ENET_HOST_BROADCAST;

2
backends/networking/enet/socket.h
View File

@ -54,7 +54,7 @@ public:
* @retval true on successful.
* @retval false on failure.
*/
bool send(Common::String address, int port, const char *data);
bool send(const Common::String &address, int port, const char *data);
/**
* Checks for received data.
* @retval true if received data.

2
backends/networking/sdl_net/client.cpp
View File

@ -183,7 +183,7 @@ Common::String Client::path() const { return _reader.path(); }
Common::String Client::query() const { return _reader.query(); }
Common::String Client::queryParameter(Common::String name) const { return _reader.queryParameter(name); }
Common::String Client::queryParameter(const Common::String &name) const { return _reader.queryParameter(name); }
Common::String Client::anchor() const { return _reader.anchor(); }

2
backends/networking/sdl_net/client.h
View File

@ -103,7 +103,7 @@ public:
Common::String method() const;
Common::String path() const;
Common::String query() const;
Common::String queryParameter(Common::String name) const;
Common::String queryParameter(const Common::String &name) const;
Common::String anchor() const;
bool noMoreContent() const;

2
backends/networking/sdl_net/getclienthandler.cpp
View File

@ -155,7 +155,7 @@ void GetClientHandler::handle(Client *client) {
client->close();
}
void GetClientHandler::setHeader(Common::String name, Common::String value) { _specialHeaders[name] = value; }
void GetClientHandler::setHeader(const Common::String &name, const Common::String &value) { _specialHeaders[name] = value; }
void GetClientHandler::setResponseCode(long code) { _responseCode = code; }
} // End of namespace Networking

6
backends/networking/sdl_net/getclienthandler.h
View File

@ -44,10 +44,10 @@ class GetClientHandler: public ClientHandler {
public:
GetClientHandler(Common::SeekableReadStream *stream);
virtual ~GetClientHandler();
~GetClientHandler() override;
virtual void handle(Client *client);
void setHeader(Common::String name, Common::String value);
void handle(Client *client) override;
void setHeader(const Common::String &name, const Common::String &value);
void setResponseCode(long code);
};

12
backends/networking/sdl_net/handlers/connectcloudhandler.cpp
View File

@ -53,7 +53,7 @@ ConnectCloudClientHandler::ConnectCloudClientHandler(const ConnectCloudHandler *
ConnectCloudClientHandler::~ConnectCloudClientHandler() {}
void ConnectCloudClientHandler::respond(Client &client, Common::String response, long responseCode) const {
void ConnectCloudClientHandler::respond(Client &client, const Common::String &response, long responseCode) const {
Common::SeekableReadStream *responseStream = HandlerUtils::makeResponseStreamFromString(response);
GetClientHandler *responseHandler = new GetClientHandler(responseStream);
responseHandler->setResponseCode(responseCode);
@ -64,7 +64,7 @@ void ConnectCloudClientHandler::respond(Client &client, Common::String response,
client.setHandler(responseHandler);
}
void ConnectCloudClientHandler::respondWithJson(Client &client, bool error, Common::String message, long responseCode) const {
void ConnectCloudClientHandler::respondWithJson(Client &client, bool error, const Common::String &message, long responseCode) const {
Common::JSONObject response;
response.setVal("error", new Common::JSONValue(error));
response.setVal("message", new Common::JSONValue(message));
@ -73,11 +73,11 @@ void ConnectCloudClientHandler::respondWithJson(Client &client, bool error, Comm
respond(client, json.stringify(true), responseCode);
}
void ConnectCloudClientHandler::handleError(Client &client, Common::String message, long responseCode) const {
void ConnectCloudClientHandler::handleError(Client &client, const Common::String &message, long responseCode) const {
respondWithJson(client, true, message, responseCode);
}
void ConnectCloudClientHandler::handleSuccess(Client &client, Common::String message) const {
void ConnectCloudClientHandler::handleSuccess(Client &client, const Common::String &message) const {
respondWithJson(client, false, message);
}
@ -116,7 +116,7 @@ void ConnectCloudClientHandler::handle(Client *client) {
return;
}
Networking::ErrorCallback callback = new Common::Callback<ConnectCloudClientHandler, Networking::ErrorResponse>(this, &ConnectCloudClientHandler::storageConnectionCallback);
Networking::ErrorCallback callback = new Common::Callback<ConnectCloudClientHandler, const Networking::ErrorResponse &>(this, &ConnectCloudClientHandler::storageConnectionCallback);
Networking::JsonResponse jsonResponse(nullptr, json);
if (!CloudMan.connectStorage(jsonResponse, callback)) { // JSON doesn't have "storage" in it or it was invalid
delete json;
@ -125,7 +125,7 @@ void ConnectCloudClientHandler::handle(Client *client) {
}
}
void ConnectCloudClientHandler::storageConnectionCallback(Networking::ErrorResponse response) {
void ConnectCloudClientHandler::storageConnectionCallback(const Networking::ErrorResponse &response) {
if (response.failed || response.interrupted) {
Common::String message = "Failed to connect storage.";
if (response.failed) {

24
backends/networking/sdl_net/handlers/connectcloudhandler.h
View File

@ -30,17 +30,17 @@
namespace Networking {
class ConnectCloudHandler: public BaseHandler {
void handleError(Client &client, Common::String message) const;
void setJsonResponseHandler(Client &client, Common::String type, Common::String message) const;
void handleError(Client &client, const Common::String &message) const;
void setJsonResponseHandler(Client &client, const Common::String &type, const Common::String &message) const;
Networking::ErrorCallback _storageConnectionCallback;
public:
ConnectCloudHandler();
virtual ~ConnectCloudHandler();
~ConnectCloudHandler() override;
virtual void handle(Client &client);
virtual bool minimalModeSupported() { return true; }
void handle(Client &client) override;
bool minimalModeSupported() override { return true; }
void setStorageConnectionCallback(Networking::ErrorCallback cb) { _storageConnectionCallback = cb; }
void storageConnected(const Networking::ErrorResponse& response) const;
@ -52,17 +52,17 @@ class ConnectCloudClientHandler : public ClientHandler {
Client *_client;
static const int32 SUSPICIOUS_CONTENT_SIZE = 640 * 1024; // 640K ought to be enough for anybody
void respond(Client &client, Common::String response, long responseCode = 200) const;
void respondWithJson(Client &client, bool error, Common::String message, long responseCode = 200) const;
void handleError(Client &client, Common::String message, long responseCode) const;
void handleSuccess(Client &client, Common::String message) const;
void storageConnectionCallback(Networking::ErrorResponse response);
void respond(Client &client, const Common::String &response, long responseCode = 200) const;
void respondWithJson(Client &client, bool error, const Common::String &message, long responseCode = 200) const;
void handleError(Client &client, const Common::String &message, long responseCode) const;
void handleSuccess(Client &client, const Common::String &message) const;
void storageConnectionCallback(const Networking::ErrorResponse &response);
public:
ConnectCloudClientHandler(const ConnectCloudHandler* cloudHandler);
virtual ~ConnectCloudClientHandler();
~ConnectCloudClientHandler() override;
virtual void handle(Client *client);
void handle(Client *client) override;
};
} // End of namespace Networking

4
backends/networking/sdl_net/handlers/createdirectoryhandler.cpp
View File

@ -32,14 +32,14 @@ CreateDirectoryHandler::CreateDirectoryHandler() {}
CreateDirectoryHandler::~CreateDirectoryHandler() {}
void CreateDirectoryHandler::handleError(Client &client, Common::String message) const {
void CreateDirectoryHandler::handleError(Client &client, const Common::String &message) const {
if (client.queryParameter("answer_json") == "true")
setJsonResponseHandler(client, "error", message);
else
HandlerUtils::setFilesManagerErrorMessageHandler(client, message);
}
void CreateDirectoryHandler::setJsonResponseHandler(Client &client, Common::String type, Common::String message) const {
void CreateDirectoryHandler::setJsonResponseHandler(Client &client, const Common::String &type, const Common::String &message) const {
Common::JSONObject response;
response.setVal("type", new Common::JSONValue(type));
response.setVal("message", new Common::JSONValue(message));

8
backends/networking/sdl_net/handlers/createdirectoryhandler.h
View File

@ -27,13 +27,13 @@
namespace Networking {
class CreateDirectoryHandler: public FilesBaseHandler {
void handleError(Client &client, Common::String message) const;
void setJsonResponseHandler(Client &client, Common::String type, Common::String message) const;
void handleError(Client &client, const Common::String &message) const;
void setJsonResponseHandler(Client &client, const Common::String &type, const Common::String &message) const;
public:
CreateDirectoryHandler();
virtual ~CreateDirectoryHandler();
~CreateDirectoryHandler() override;
virtual void handle(Client &client);
void handle(Client &client) override;
};
} // End of namespace Networking

4
backends/networking/sdl_net/handlers/downloadfilehandler.h
View File

@ -29,9 +29,9 @@ namespace Networking {
class DownloadFileHandler: public FilesBaseHandler {
public:
DownloadFileHandler();
virtual ~DownloadFileHandler();
~DownloadFileHandler() override;
virtual void handle(Client &client);
void handle(Client &client) override;
};
} // End of namespace Networking

Some files were not shown because too many files have changed in this diff Show More