aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Tkachev2016-06-06 20:04:13 +0600
committerAlexander Tkachev2016-08-24 16:07:55 +0600
commitbb207ae513ef02bfaf8e76374af40419a20742fe (patch)
treece6be0e78048ede03233e62149c0040c3d07cf20
parentf24a89e080df860f7a32a8b3c9f272c1623aedbb (diff)
downloadscummvm-rg350-bb207ae513ef02bfaf8e76374af40419a20742fe.tar.gz
scummvm-rg350-bb207ae513ef02bfaf8e76374af40419a20742fe.tar.bz2
scummvm-rg350-bb207ae513ef02bfaf8e76374af40419a20742fe.zip
CLOUD: Add GoogleDriveResolveIdRequest
GoogleDriveResolveIdRequest gets a lowercase path and searches for the specified file's id. To do that it lists path's subdirectories one by one with GoogleDriveListDirectoryByIdRequest. GoogleDriveListDirectoryByIdRequest gets a Google Drive id and lists that directory (not recursively).
-rw-r--r--backends/cloud/cloudmanager.cpp9
-rw-r--r--backends/cloud/googledrive/googledrivelistdirectorybyidrequest.cpp144
-rw-r--r--backends/cloud/googledrive/googledrivelistdirectorybyidrequest.h61
-rw-r--r--backends/cloud/googledrive/googledriveresolveidrequest.cpp128
-rw-r--r--backends/cloud/googledrive/googledriveresolveidrequest.h61
-rw-r--r--backends/cloud/googledrive/googledrivestorage.cpp68
-rw-r--r--backends/cloud/googledrive/googledrivestorage.h16
-rw-r--r--backends/cloud/storagefile.cpp8
-rw-r--r--backends/cloud/storagefile.h3
-rw-r--r--backends/module.mk2
10 files changed, 495 insertions, 5 deletions
diff --git a/backends/cloud/cloudmanager.cpp b/backends/cloud/cloudmanager.cpp
index 4230c1453b..03cc8f264b 100644
--- a/backends/cloud/cloudmanager.cpp
+++ b/backends/cloud/cloudmanager.cpp
@@ -124,7 +124,14 @@ SavesSyncRequest *CloudManager::syncSaves(Storage::BoolCallback callback, Networ
void CloudManager::testFeature() {
Storage *storage = getCurrentStorage();
- if (storage) storage->info(nullptr, nullptr);
+ //if (storage) storage->info(nullptr, nullptr);
+ GoogleDrive::GoogleDriveStorage *gd = dynamic_cast<GoogleDrive::GoogleDriveStorage *>(storage);
+ if (gd) gd->resolveFileId("firstfolder/subfolder", nullptr, nullptr);
+ //gd->listDirectoryById("appDataFolder", nullptr, nullptr);
+ //gd->listDirectoryById("1LWq-r1IwegkJJ0eZpswGlyjj8nu6XyUmosvxD7L0F9X3", nullptr, nullptr);
+ //gd->createDirectoryWithParentId("1LWq-r1IwegkJJ0eZpswGlyjj8nu6XyUmosvxD7L0F9X3", "subfolder", nullptr, nullptr);
+ //gd->createDirectoryWithParentId("appDataFolder", "firstfolder", nullptr, nullptr);
+ else debug("FAILURE");
}
bool CloudManager::isWorking() {
diff --git a/backends/cloud/googledrive/googledrivelistdirectorybyidrequest.cpp b/backends/cloud/googledrive/googledrivelistdirectorybyidrequest.cpp
new file mode 100644
index 0000000000..0915b623f3
--- /dev/null
+++ b/backends/cloud/googledrive/googledrivelistdirectorybyidrequest.cpp
@@ -0,0 +1,144 @@
+/* ScummVM - Graphic Adventure Engine
+*
+* ScummVM is the legal property of its developers, whose names
+* are too numerous to list here. Please refer to the COPYRIGHT
+* file distributed with this source distribution.
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License
+* as published by the Free Software Foundation; either version 2
+* of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+*
+*/
+
+#include "backends/cloud/googledrive/googledrivelistdirectorybyidrequest.h"
+#include "backends/cloud/googledrive/googledrivestorage.h"
+#include "backends/cloud/iso8601.h"
+#include "backends/cloud/storage.h"
+#include "backends/networking/curl/connectionmanager.h"
+#include "backends/networking/curl/curljsonrequest.h"
+#include "backends/networking/curl/networkreadstream.h"
+#include "common/json.h"
+#include "googledrivetokenrefresher.h"
+
+namespace Cloud {
+namespace GoogleDrive {
+
+GoogleDriveListDirectoryByIdRequest::GoogleDriveListDirectoryByIdRequest(GoogleDriveStorage *storage, Common::String id, Storage::ListDirectoryCallback cb, Networking::ErrorCallback ecb):
+ Networking::Request(nullptr, ecb), _requestedId(id), _storage(storage), _listDirectoryCallback(cb),
+ _workingRequest(nullptr), _ignoreCallback(false) {
+ start();
+}
+
+GoogleDriveListDirectoryByIdRequest::~GoogleDriveListDirectoryByIdRequest() {
+ _ignoreCallback = true;
+ if (_workingRequest) _workingRequest->finish();
+ delete _listDirectoryCallback;
+}
+
+void GoogleDriveListDirectoryByIdRequest::start() {
+ _ignoreCallback = true;
+ if (_workingRequest) _workingRequest->finish();
+ _files.clear();
+ _ignoreCallback = false;
+
+ makeRequest("");
+}
+
+void GoogleDriveListDirectoryByIdRequest::makeRequest(Common::String pageToken) {
+ Common::String url = "https://www.googleapis.com/drive/v3/files?spaces=appDataFolder";
+ 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::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) {
+ _workingRequest = nullptr;
+ if (_ignoreCallback) return;
+
+ Networking::ErrorResponse error(this);
+ Networking::CurlJsonRequest *rq = (Networking::CurlJsonRequest *)response.request;
+ if (rq && rq->getNetworkReadStream())
+ error.httpResponseCode = rq->getNetworkReadStream()->httpResponseCode();
+
+ Common::JSONValue *json = response.value;
+ if (json) {
+ Common::JSONObject responseObject = json->asObject();
+
+ ///debug("%s", json->stringify(true).c_str());
+
+ if (responseObject.contains("error") || responseObject.contains("error_summary")) {
+ warning("GoogleDrive returned error: %s", responseObject.getVal("error_summary")->asString().c_str());
+ error.failed = true;
+ error.response = json->stringify();
+ finishError(error);
+ delete json;
+ return;
+ }
+
+ //TODO: check that ALL keys exist AND HAVE RIGHT TYPE to avoid segfaults
+
+ if (responseObject.contains("files") && responseObject.getVal("files")->isArray()) {
+ Common::JSONArray items = responseObject.getVal("files")->asArray();
+ for (uint32 i = 0; i < items.size(); ++i) {
+ Common::JSONObject item = items[i]->asObject();
+ Common::String path = item.getVal("id")->asString();
+ Common::String name = item.getVal("name")->asString();
+ bool isDirectory = (item.getVal("mimeType")->asString() == "application/vnd.google-apps.folder");
+ uint32 size = 0, timestamp = 0;
+ if (!isDirectory) {
+ size = item.getVal("size")->asIntegerNumber();
+ timestamp = ISO8601::convertToTimestamp(item.getVal("modifiedTime")->asString());
+ }
+ _files.push_back(StorageFile(path, name, size, timestamp, isDirectory));
+ }
+ }
+
+ bool hasMore = (responseObject.contains("nextPageToken"));
+
+ if (hasMore) {
+ Common::String token = responseObject.getVal("nextPageToken")->asString();
+ makeRequest(token);
+ } else {
+ finishSuccess(_files);
+ }
+ } else {
+ warning("null, not json");
+ error.failed = true;
+ finishError(error);
+ }
+
+ delete json;
+}
+
+void GoogleDriveListDirectoryByIdRequest::errorCallback(Networking::ErrorResponse error) {
+ _workingRequest = nullptr;
+ if (_ignoreCallback) return;
+ finishError(error);
+}
+
+void GoogleDriveListDirectoryByIdRequest::handle() {}
+
+void GoogleDriveListDirectoryByIdRequest::restart() { start(); }
+
+void GoogleDriveListDirectoryByIdRequest::finishSuccess(Common::Array<StorageFile> &files) {
+ Request::finishSuccess();
+ if (_listDirectoryCallback) (*_listDirectoryCallback)(Storage::ListDirectoryResponse(this, files));
+}
+
+} // End of namespace GoogleDrive
+} // End of namespace Cloud
diff --git a/backends/cloud/googledrive/googledrivelistdirectorybyidrequest.h b/backends/cloud/googledrive/googledrivelistdirectorybyidrequest.h
new file mode 100644
index 0000000000..569984520a
--- /dev/null
+++ b/backends/cloud/googledrive/googledrivelistdirectorybyidrequest.h
@@ -0,0 +1,61 @@
+/* ScummVM - Graphic Adventure Engine
+*
+* ScummVM is the legal property of its developers, whose names
+* are too numerous to list here. Please refer to the COPYRIGHT
+* file distributed with this source distribution.
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License
+* as published by the Free Software Foundation; either version 2
+* of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+*
+*/
+
+#ifndef BACKENDS_CLOUD_GOOGLEDRIVE_GOOGLEDRIVELISTDIRECTORYBYIDREQUEST_H
+#define BACKENDS_CLOUD_GOOGLEDRIVE_GOOGLEDRIVELISTDIRECTORYBYIDREQUEST_H
+
+#include "backends/cloud/storage.h"
+#include "backends/networking/curl/request.h"
+#include "common/callback.h"
+#include "backends/networking/curl/curljsonrequest.h"
+
+namespace Cloud {
+namespace GoogleDrive {
+
+class GoogleDriveStorage;
+
+class GoogleDriveListDirectoryByIdRequest: public Networking::Request {
+ Common::String _requestedId;
+ GoogleDriveStorage *_storage;
+
+ Storage::ListDirectoryCallback _listDirectoryCallback;
+ Common::Array<StorageFile> _files;
+ Request *_workingRequest;
+ bool _ignoreCallback;
+
+ void start();
+ void makeRequest(Common::String pageToken);
+ void responseCallback(Networking::JsonResponse response);
+ void errorCallback(Networking::ErrorResponse error);
+ void finishSuccess(Common::Array<StorageFile> &files);
+public:
+ GoogleDriveListDirectoryByIdRequest(GoogleDriveStorage *storage, Common::String id, Storage::ListDirectoryCallback cb, Networking::ErrorCallback ecb);
+ virtual ~GoogleDriveListDirectoryByIdRequest();
+
+ virtual void handle();
+ virtual void restart();
+};
+
+} // End of namespace GoogleDrive
+} // End of namespace Cloud
+
+#endif
diff --git a/backends/cloud/googledrive/googledriveresolveidrequest.cpp b/backends/cloud/googledrive/googledriveresolveidrequest.cpp
new file mode 100644
index 0000000000..bde17b4533
--- /dev/null
+++ b/backends/cloud/googledrive/googledriveresolveidrequest.cpp
@@ -0,0 +1,128 @@
+/* ScummVM - Graphic Adventure Engine
+*
+* ScummVM is the legal property of its developers, whose names
+* are too numerous to list here. Please refer to the COPYRIGHT
+* file distributed with this source distribution.
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License
+* as published by the Free Software Foundation; either version 2
+* of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+*
+*/
+
+#include "backends/cloud/googledrive/googledriveresolveidrequest.h"
+#include "backends/cloud/googledrive/googledrivestorage.h"
+#include "backends/cloud/googledrive/googledrivetokenrefresher.h"
+#include "backends/cloud/iso8601.h"
+#include "backends/networking/curl/connectionmanager.h"
+#include "backends/networking/curl/networkreadstream.h"
+#include "common/json.h"
+
+namespace Cloud {
+namespace GoogleDrive {
+
+GoogleDriveResolveIdRequest::GoogleDriveResolveIdRequest(GoogleDriveStorage *storage, 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) {
+ start();
+}
+
+GoogleDriveResolveIdRequest::~GoogleDriveResolveIdRequest() {
+ _ignoreCallback = true;
+ if (_workingRequest) _workingRequest->finish();
+ delete _uploadCallback;
+}
+
+void GoogleDriveResolveIdRequest::start() {
+ //cleanup
+ _ignoreCallback = true;
+ if (_workingRequest) _workingRequest->finish();
+ _workingRequest = nullptr;
+ _currentDirectory = "";
+ _currentDirectoryId = "appDataFolder";
+ _ignoreCallback = false;
+
+ listNextDirectory(StorageFile("", 0, 0, false));
+}
+
+void GoogleDriveResolveIdRequest::listNextDirectory(StorageFile fileToReturn) {
+ if (_currentDirectory == _requestedPath) {
+ finishFile(fileToReturn);
+ return;
+ }
+
+ Storage::FileArrayCallback callback = new Common::Callback<GoogleDriveResolveIdRequest, Storage::FileArrayResponse>(this, &GoogleDriveResolveIdRequest::listedDirectoryCallback);
+ Networking::ErrorCallback failureCallback = new Common::Callback<GoogleDriveResolveIdRequest, Networking::ErrorResponse>(this, &GoogleDriveResolveIdRequest::listedDirectoryErrorCallback);
+ _workingRequest = _storage->listDirectoryById(_currentDirectoryId, callback, failureCallback);
+}
+
+void GoogleDriveResolveIdRequest::listedDirectoryCallback(Storage::FileArrayResponse response) {
+ _workingRequest = nullptr;
+ if (_ignoreCallback) return;
+
+ Common::String currentLevelName = _requestedPath;
+ ///debug("'%s'", currentLevelName.c_str());
+ if (_currentDirectory.size()) currentLevelName.erase(0, _currentDirectory.size());
+ if (currentLevelName.size() && (currentLevelName[0] == '/' || currentLevelName[0] == '\\')) currentLevelName.erase(0, 1);
+ ///debug("'%s'", currentLevelName.c_str());
+ for (uint32 i = 0; i < currentLevelName.size(); ++i) {
+ if (currentLevelName[i] == '/' || currentLevelName[i] == '\\') {
+ currentLevelName.erase(i);
+ ///debug("'%s'", currentLevelName.c_str());
+ break;
+ }
+ }
+
+ ///debug("so, searching for '%s' in '%s'", currentLevelName.c_str(), _currentDirectory.c_str());
+
+ Common::Array<StorageFile> &files = response.value;
+ bool found = false;
+ for (uint32 i = 0; i < files.size(); ++i) {
+ if (files[i].isDirectory() && files[i].name() == currentLevelName) {
+ if (_currentDirectory != "") _currentDirectory += "/";
+ _currentDirectory += files[i].name();
+ _currentDirectoryId = files[i].path();
+ ///debug("found it! new directory and its id: '%s', '%s'", _currentDirectory.c_str(), _currentDirectoryId.c_str());
+ listNextDirectory(files[i]);
+ found = true;
+ break;
+ }
+ }
+
+ if (!found) {
+ Common::String path = _currentDirectory;
+ if (path != "") path += "/";
+ path += currentLevelName;
+ if (path == _requestedPath) finishError(Networking::ErrorResponse(this, false, true, "no such file found in its parent directory", 404));
+ else finishError(Networking::ErrorResponse(this, false, true, "subdirectory not found", 400));
+ }
+}
+
+void GoogleDriveResolveIdRequest::listedDirectoryErrorCallback(Networking::ErrorResponse error) {
+ _workingRequest = nullptr;
+ if (_ignoreCallback) return;
+ finishError(error);
+}
+
+void GoogleDriveResolveIdRequest::handle() {}
+
+void GoogleDriveResolveIdRequest::restart() { start(); }
+
+void GoogleDriveResolveIdRequest::finishFile(StorageFile file) {
+ Request::finishSuccess();
+ if (_uploadCallback) (*_uploadCallback)(Storage::UploadResponse(this, file));
+}
+
+} // End of namespace GoogleDrive
+} // End of namespace Cloud
diff --git a/backends/cloud/googledrive/googledriveresolveidrequest.h b/backends/cloud/googledrive/googledriveresolveidrequest.h
new file mode 100644
index 0000000000..cd6f244a94
--- /dev/null
+++ b/backends/cloud/googledrive/googledriveresolveidrequest.h
@@ -0,0 +1,61 @@
+/* ScummVM - Graphic Adventure Engine
+*
+* ScummVM is the legal property of its developers, whose names
+* are too numerous to list here. Please refer to the COPYRIGHT
+* file distributed with this source distribution.
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License
+* as published by the Free Software Foundation; either version 2
+* of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+*
+*/
+
+#ifndef BACKENDS_CLOUD_GOOGLEDRIVE_GOOGLEDRIVERESOLVEIDREQUEST_H
+#define BACKENDS_CLOUD_GOOGLEDRIVE_GOOGLEDRIVERESOLVEIDREQUEST_H
+
+#include "backends/cloud/storage.h"
+#include "backends/networking/curl/curljsonrequest.h"
+#include "backends/networking/curl/request.h"
+#include "common/callback.h"
+
+namespace Cloud {
+namespace GoogleDrive {
+
+class GoogleDriveStorage;
+
+class GoogleDriveResolveIdRequest: public Networking::Request {
+ Common::String _requestedPath;
+ GoogleDriveStorage *_storage;
+ Storage::UploadCallback _uploadCallback;
+ Common::String _currentDirectory;
+ Common::String _currentDirectoryId;
+ Request *_workingRequest;
+ bool _ignoreCallback;
+
+ void start();
+ void listNextDirectory(StorageFile fileToReturn);
+ void listedDirectoryCallback(Storage::FileArrayResponse response);
+ void listedDirectoryErrorCallback(Networking::ErrorResponse error);
+ void finishFile(StorageFile file);
+public:
+ GoogleDriveResolveIdRequest(GoogleDriveStorage *storage, Common::String path, Storage::UploadCallback cb, Networking::ErrorCallback ecb, bool recursive = false); //TODO: why upload?
+ virtual ~GoogleDriveResolveIdRequest();
+
+ virtual void handle();
+ virtual void restart();
+};
+
+} // End of namespace GoogleDrive
+} // End of namespace Cloud
+
+#endif
diff --git a/backends/cloud/googledrive/googledrivestorage.cpp b/backends/cloud/googledrive/googledrivestorage.cpp
index eef7f1f28d..b0c0d47ecf 100644
--- a/backends/cloud/googledrive/googledrivestorage.cpp
+++ b/backends/cloud/googledrive/googledrivestorage.cpp
@@ -31,6 +31,8 @@
#include "common/debug.h"
#include "common/json.h"
#include <curl/curl.h>
+#include "googledrivelistdirectorybyidrequest.h"
+#include "googledriveresolveidrequest.h"
namespace Cloud {
namespace GoogleDrive {
@@ -177,6 +179,25 @@ void GoogleDriveStorage::infoInnerCallback(StorageInfoCallback outerCallback, Ne
delete json;
}
+void GoogleDriveStorage::createDirectoryInnerCallback(BoolCallback outerCallback, Networking::JsonResponse response) {
+ Common::JSONValue *json = response.value;
+ if (!json) {
+ warning("NULL passed instead of JSON");
+ delete outerCallback;
+ return;
+ }
+
+ debug("%s", json->stringify(true).c_str());
+
+ if (outerCallback) {
+ Common::JSONObject info = json->asObject();
+ ///(*outerCallback)(BoolResponse(nullptr, true);
+ delete outerCallback;
+ }
+
+ delete json;
+}
+
void GoogleDriveStorage::printJson(Networking::JsonResponse response) {
Common::JSONValue *json = response.value;
if (!json) {
@@ -211,11 +232,23 @@ void GoogleDriveStorage::fileInfoCallback(Networking::NetworkReadStreamCallback
delete response.value;
}
+Networking::Request *GoogleDriveStorage::resolveFileId(Common::String path, UploadCallback callback, Networking::ErrorCallback errorCallback) {
+ if (!errorCallback) errorCallback = getErrorPrintingCallback();
+ if (!callback) callback = new Common::Callback<GoogleDriveStorage, UploadResponse>(this, &GoogleDriveStorage::printFile);
+ return addRequest(new GoogleDriveResolveIdRequest(this, path, callback, errorCallback));
+}
+
Networking::Request *GoogleDriveStorage::listDirectory(Common::String path, ListDirectoryCallback callback, Networking::ErrorCallback errorCallback, bool recursive) {
//return addRequest(new GoogleDriveListDirectoryRequest(this, path, callback, errorCallback, recursive));
return nullptr; //TODO
}
+Networking::Request *GoogleDriveStorage::listDirectoryById(Common::String id, ListDirectoryCallback callback, Networking::ErrorCallback errorCallback) {
+ if (!errorCallback) errorCallback = getErrorPrintingCallback();
+ if (!callback) callback = new Common::Callback<GoogleDriveStorage, 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) {
//return addRequest(new GoogleDriveUploadRequest(this, path, contents, callback, errorCallback));
return nullptr; //TODO
@@ -240,8 +273,11 @@ void GoogleDriveStorage::fileDownloaded(BoolResponse response) {
void GoogleDriveStorage::printFiles(FileArrayResponse response) {
debug("files:");
Common::Array<StorageFile> &files = response.value;
- for (uint32 i = 0; i < files.size(); ++i)
+ for (uint32 i = 0; i < files.size(); ++i) {
+ debug("\t%s%s", files[i].name().c_str(), files[i].isDirectory() ? " (directory)" : "");
debug("\t%s", files[i].path().c_str());
+ debug("");
+ }
}
void GoogleDriveStorage::printBool(BoolResponse response) {
@@ -250,7 +286,8 @@ void GoogleDriveStorage::printBool(BoolResponse response) {
void GoogleDriveStorage::printFile(UploadResponse response) {
debug("\nuploaded file info:");
- debug("\tpath: %s", response.value.path().c_str());
+ debug("\tid: %s", response.value.path().c_str());
+ debug("\tname: %s", response.value.name().c_str());
debug("\tsize: %u", response.value.size());
debug("\ttimestamp: %u", response.value.timestamp());
}
@@ -268,6 +305,33 @@ Networking::Request *GoogleDriveStorage::createDirectory(Common::String path, Bo
return nullptr; //TODO
}
+Networking::Request *GoogleDriveStorage::createDirectoryWithParentId(Common::String parentId, Common::String name, BoolCallback callback, Networking::ErrorCallback errorCallback) {
+ if (!errorCallback) errorCallback = getErrorPrintingCallback();
+ //return addRequest(new GoogleDriveCreateDirectoryRequest(this, path, callback, errorCallback));
+ Common::String url = "https://www.googleapis.com/drive/v3/files";
+ //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 innerCallback = new Common::CallbackBridge<GoogleDriveStorage, BoolResponse, Networking::JsonResponse>(this, &GoogleDriveStorage::createDirectoryInnerCallback, callback);
+ Networking::CurlJsonRequest *request = new GoogleDriveTokenRefresher(this, innerCallback, errorCallback, url.c_str());
+ request->addHeader("Authorization: Bearer " + accessToken());
+ request->addHeader("Content-Type: application/json");
+
+ Common::JSONArray parentsArray;
+ parentsArray.push_back(new Common::JSONValue(parentId));
+
+ Common::JSONObject jsonRequestParameters;
+ jsonRequestParameters.setVal("mimeType", new Common::JSONValue("application/vnd.google-apps.folder"));
+ jsonRequestParameters.setVal("name", new Common::JSONValue(name));
+ jsonRequestParameters.setVal("parents", new Common::JSONValue(parentsArray));
+ //jsonRequestParameters.setVal("include_deleted", new Common::JSONValue(false));
+
+ Common::JSONValue value(jsonRequestParameters);
+ request->addPostField(Common::JSON::stringify(&value));
+
+ return addRequest(request);
+ return nullptr; //TODO
+}
+
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);
diff --git a/backends/cloud/googledrive/googledrivestorage.h b/backends/cloud/googledrive/googledrivestorage.h
index 8a82a54533..274bc78401 100644
--- a/backends/cloud/googledrive/googledrivestorage.h
+++ b/backends/cloud/googledrive/googledrivestorage.h
@@ -52,6 +52,9 @@ class GoogleDriveStorage: public Cloud::Storage {
/** Constructs StorageInfo based on JSON response from cloud. */
void infoInnerCallback(StorageInfoCallback outerCallback, Networking::JsonResponse json);
+ /** Returns bool based on JSON response from cloud. */
+ void createDirectoryInnerCallback(BoolCallback outerCallback, Networking::JsonResponse json);
+
void printJson(Networking::JsonResponse response);
void fileDownloaded(BoolResponse response);
void printFiles(FileArrayResponse response);
@@ -59,7 +62,7 @@ class GoogleDriveStorage: public Cloud::Storage {
void printFile(UploadResponse response);
void printInfo(StorageInfoResponse response);
- void fileInfoCallback(Networking::NetworkReadStreamCallback outerCallback, Networking::JsonResponse response);
+ void fileInfoCallback(Networking::NetworkReadStreamCallback outerCallback, Networking::JsonResponse response);
public:
virtual ~GoogleDriveStorage();
@@ -78,9 +81,15 @@ public:
/** Public Cloud API comes down there. */
- /** Returns ListDirectoryStatus struct with list of files. */
+ /** Returns StorageFile with the resolved file's id. */
+ virtual Networking::Request *resolveFileId(Common::String path, UploadCallback callback, Networking::ErrorCallback errorCallback);
+
+ /** Returns Array<StorageFile> - the list of files. */
virtual Networking::Request *listDirectory(Common::String path, ListDirectoryCallback callback, Networking::ErrorCallback errorCallback, bool recursive = false);
+ /** Returns Array<StorageFile> - the list of files. */
+ virtual Networking::Request *listDirectoryById(Common::String id, ListDirectoryCallback callback, Networking::ErrorCallback errorCallback);
+
/** Returns UploadStatus struct with info about uploaded file. */
virtual Networking::Request *upload(Common::String path, Common::SeekableReadStream *contents, UploadCallback callback, Networking::ErrorCallback errorCallback);
@@ -93,6 +102,9 @@ public:
/** Calls the callback when finished. */
virtual Networking::Request *createDirectory(Common::String path, BoolCallback callback, Networking::ErrorCallback errorCallback);
+ /** Calls the callback when finished. */
+ virtual Networking::Request *createDirectoryWithParentId(Common::String parentId, Common::String name, BoolCallback callback, Networking::ErrorCallback errorCallback);
+
/** Returns the StorageInfo struct. */
virtual Networking::Request *info(StorageInfoCallback callback, Networking::ErrorCallback errorCallback);
diff --git a/backends/cloud/storagefile.cpp b/backends/cloud/storagefile.cpp
index b37b5e0d53..452cce3cf3 100644
--- a/backends/cloud/storagefile.cpp
+++ b/backends/cloud/storagefile.cpp
@@ -53,4 +53,12 @@ StorageFile::StorageFile(Common::String pth, uint32 sz, uint32 ts, bool dir) {
_isDirectory = dir;
}
+StorageFile::StorageFile(Common::String id, Common::String name, uint32 sz, uint32 ts, bool dir) {
+ _path = id;
+ _name = name;
+ _size = sz;
+ _timestamp = ts;
+ _isDirectory = dir;
+}
+
} // End of namespace Cloud
diff --git a/backends/cloud/storagefile.h b/backends/cloud/storagefile.h
index 704a03867f..7503653d6b 100644
--- a/backends/cloud/storagefile.h
+++ b/backends/cloud/storagefile.h
@@ -41,6 +41,9 @@ public:
StorageFile(); //invalid empty file
StorageFile(Common::String pth, uint32 sz, uint32 ts, bool dir);
+ /** In this constructor <path> is used to storage <id> (in Google Drive, for example) */
+ StorageFile(Common::String id, Common::String name, uint32 sz, uint32 ts, bool dir);
+
Common::String path() const { return _path; }
Common::String name() const { return _name; }
uint32 size() const { return _size; }
diff --git a/backends/module.mk b/backends/module.mk
index f1ba8b8b1b..14755b21eb 100644
--- a/backends/module.mk
+++ b/backends/module.mk
@@ -32,6 +32,8 @@ MODULE_OBJS += \
cloud/dropbox/dropboxcreatedirectoryrequest.o \
cloud/dropbox/dropboxlistdirectoryrequest.o \
cloud/dropbox/dropboxuploadrequest.o \
+ cloud/googledrive/googledrivelistdirectorybyidrequest.o \
+ cloud/googledrive/googledriveresolveidrequest.o \
cloud/googledrive/googledrivestorage.o \
cloud/googledrive/googledrivetokenrefresher.o \
cloud/onedrive/onedrivestorage.o \