aboutsummaryrefslogtreecommitdiff
path: root/backends/cloud
diff options
context:
space:
mode:
authorAlexander Tkachev2016-06-07 13:07:46 +0600
committerAlexander Tkachev2016-08-24 16:07:55 +0600
commitd1d71afb0724c372143d2c303c70291ba43d2d68 (patch)
tree39d65eb01c40a055bd4198eca6185632ffc9de45 /backends/cloud
parentb4b6ee0186750d6f2e8143313fc059c20512c306 (diff)
downloadscummvm-rg350-d1d71afb0724c372143d2c303c70291ba43d2d68.tar.gz
scummvm-rg350-d1d71afb0724c372143d2c303c70291ba43d2d68.tar.bz2
scummvm-rg350-d1d71afb0724c372143d2c303c70291ba43d2d68.zip
CLOUD: Add GoogleDriveListDirectoryRequest
When listing directories, you get a list of StorageFiles, which path() is actually Google Drive id. Thus, if you list a directory recursively, you won't be able to determine whether all files are within one directory or have some hierarchy. I'd fix that as soon as it would be needed.
Diffstat (limited to 'backends/cloud')
-rw-r--r--backends/cloud/cloudmanager.cpp6
-rw-r--r--backends/cloud/googledrive/googledrivelistdirectoryrequest.cpp117
-rw-r--r--backends/cloud/googledrive/googledrivelistdirectoryrequest.h65
-rw-r--r--backends/cloud/googledrive/googledriveresolveidrequest.cpp2
-rw-r--r--backends/cloud/googledrive/googledrivestorage.cpp6
5 files changed, 192 insertions, 4 deletions
diff --git a/backends/cloud/cloudmanager.cpp b/backends/cloud/cloudmanager.cpp
index 0be52cd886..64fa19ceb9 100644
--- a/backends/cloud/cloudmanager.cpp
+++ b/backends/cloud/cloudmanager.cpp
@@ -155,7 +155,11 @@ void CloudManager::testFeature() {
//gd->createDirectory("firstfolder/subfolder/newfolder3/megafolder", nullptr, nullptr);
//check it's there: +
- gd->listDirectoryById("1OXWPtfNgnmR_1K7SDm2v5J923bbAWrTdVDj-zRppLZDw", nullptr, nullptr);
+ //gd->listDirectoryById("1OXWPtfNgnmR_1K7SDm2v5J923bbAWrTdVDj-zRppLZDw", nullptr, nullptr);
+
+ //gd->listDirectory("", nullptr, nullptr);
+ //gd->listDirectory("firstfolder", nullptr, nullptr);
+ gd->listDirectory("firstfolder/subfolder", nullptr, nullptr, true);
}
//gd->resolveFileId("firstfolder/subfolder", nullptr, nullptr);
//gd->listDirectoryById("appDataFolder", nullptr, nullptr);
diff --git a/backends/cloud/googledrive/googledrivelistdirectoryrequest.cpp b/backends/cloud/googledrive/googledrivelistdirectoryrequest.cpp
new file mode 100644
index 0000000000..803682b684
--- /dev/null
+++ b/backends/cloud/googledrive/googledrivelistdirectoryrequest.cpp
@@ -0,0 +1,117 @@
+/* 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/googledrivelistdirectoryrequest.h"
+#include "backends/cloud/googledrive/googledrivestorage.h"
+
+namespace Cloud {
+namespace GoogleDrive {
+
+GoogleDriveListDirectoryRequest::GoogleDriveListDirectoryRequest(GoogleDriveStorage *storage, 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) {
+ start();
+}
+
+GoogleDriveListDirectoryRequest::~GoogleDriveListDirectoryRequest() {
+ _ignoreCallback = true;
+ if (_workingRequest) _workingRequest->finish();
+ delete _listDirectoryCallback;
+}
+
+void GoogleDriveListDirectoryRequest::start() {
+ //cleanup
+ _ignoreCallback = true;
+ if (_workingRequest) _workingRequest->finish();
+ _workingRequest = nullptr;
+ _files.clear();
+ _directoriesQueue.clear();
+ _currentDirectory = "";
+ _ignoreCallback = false;
+
+ //find out that directory's id
+ Storage::UploadCallback innerCallback = new Common::Callback<GoogleDriveListDirectoryRequest, Storage::UploadResponse>(this, &GoogleDriveListDirectoryRequest::idResolvedCallback);
+ Networking::ErrorCallback innerErrorCallback = new Common::Callback<GoogleDriveListDirectoryRequest, Networking::ErrorResponse>(this, &GoogleDriveListDirectoryRequest::idResolveErrorCallback);
+ _workingRequest = _storage->resolveFileId(_requestedPath, innerCallback, innerErrorCallback);
+}
+
+void GoogleDriveListDirectoryRequest::idResolvedCallback(Storage::UploadResponse response) {
+ _workingRequest = nullptr;
+ if (_ignoreCallback) return;
+
+ _directoriesQueue.push_back(response.value.path());
+ listNextDirectory();
+}
+
+void GoogleDriveListDirectoryRequest::idResolveErrorCallback(Networking::ErrorResponse error) {
+ _workingRequest = nullptr;
+ if (_ignoreCallback) return;
+ finishError(error);
+}
+
+void GoogleDriveListDirectoryRequest::listNextDirectory() {
+ if (_directoriesQueue.empty()) {
+ finishSuccess(_files);
+ return;
+ }
+
+ _currentDirectory = _directoriesQueue.back();
+ _directoriesQueue.pop_back();
+
+ Storage::FileArrayCallback callback = new Common::Callback<GoogleDriveListDirectoryRequest, Storage::FileArrayResponse>(this, &GoogleDriveListDirectoryRequest::listedDirectoryCallback);
+ Networking::ErrorCallback failureCallback = new Common::Callback<GoogleDriveListDirectoryRequest, Networking::ErrorResponse>(this, &GoogleDriveListDirectoryRequest::listedDirectoryErrorCallback);
+ _workingRequest = _storage->listDirectoryById(_currentDirectory, callback, failureCallback);
+}
+
+void GoogleDriveListDirectoryRequest::listedDirectoryCallback(Storage::FileArrayResponse response) {
+ _workingRequest = nullptr;
+ if (_ignoreCallback) return;
+
+ for (uint32 i = 0; i < response.value.size(); ++i) {
+ StorageFile &file = response.value[i];
+ _files.push_back(file);
+ if (_requestedRecursive && file.isDirectory()) {
+ _directoriesQueue.push_back(file.path());
+ }
+ }
+
+ listNextDirectory();
+}
+
+void GoogleDriveListDirectoryRequest::listedDirectoryErrorCallback(Networking::ErrorResponse error) {
+ _workingRequest = nullptr;
+ if (_ignoreCallback) return;
+ finishError(error);
+}
+
+void GoogleDriveListDirectoryRequest::handle() {}
+
+void GoogleDriveListDirectoryRequest::restart() { start(); }
+
+void GoogleDriveListDirectoryRequest::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/googledrivelistdirectoryrequest.h b/backends/cloud/googledrive/googledrivelistdirectoryrequest.h
new file mode 100644
index 0000000000..3eee83fed1
--- /dev/null
+++ b/backends/cloud/googledrive/googledrivelistdirectoryrequest.h
@@ -0,0 +1,65 @@
+/* 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_GOOGLEDRIVELISTDIRECTORYREQUEST_H
+#define BACKENDS_CLOUD_GOOGLEDRIVE_GOOGLEDRIVELISTDIRECTORYREQUEST_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 GoogleDriveListDirectoryRequest: public Networking::Request {
+ Common::String _requestedPath;
+ bool _requestedRecursive;
+ GoogleDriveStorage *_storage;
+ Storage::ListDirectoryCallback _listDirectoryCallback;
+ Common::Array<StorageFile> _files;
+ Common::Array<Common::String> _directoriesQueue;
+ Common::String _currentDirectory;
+ Request *_workingRequest;
+ bool _ignoreCallback;
+
+ void start();
+ void idResolvedCallback(Storage::UploadResponse response);
+ void idResolveErrorCallback(Networking::ErrorResponse error);
+ void listNextDirectory();
+ void listedDirectoryCallback(Storage::FileArrayResponse response);
+ void listedDirectoryErrorCallback(Networking::ErrorResponse error);
+ void finishSuccess(Common::Array<StorageFile> &files);
+public:
+ GoogleDriveListDirectoryRequest(GoogleDriveStorage *storage, Common::String path, Storage::ListDirectoryCallback cb, Networking::ErrorCallback ecb, bool recursive = false);
+ virtual ~GoogleDriveListDirectoryRequest();
+
+ 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
index 5dcb5c6e11..0ef0cd982f 100644
--- a/backends/cloud/googledrive/googledriveresolveidrequest.cpp
+++ b/backends/cloud/googledrive/googledriveresolveidrequest.cpp
@@ -53,7 +53,7 @@ void GoogleDriveResolveIdRequest::start() {
_currentDirectoryId = "appDataFolder";
_ignoreCallback = false;
- listNextDirectory(StorageFile("", 0, 0, false));
+ listNextDirectory(StorageFile(_currentDirectoryId, 0, 0, true));
}
void GoogleDriveResolveIdRequest::listNextDirectory(StorageFile fileToReturn) {
diff --git a/backends/cloud/googledrive/googledrivestorage.cpp b/backends/cloud/googledrive/googledrivestorage.cpp
index 1750dc9646..3c85b1f074 100644
--- a/backends/cloud/googledrive/googledrivestorage.cpp
+++ b/backends/cloud/googledrive/googledrivestorage.cpp
@@ -34,6 +34,7 @@
#include "googledrivelistdirectorybyidrequest.h"
#include "googledriveresolveidrequest.h"
#include "googledrivecreatedirectoryrequest.h"
+#include "googledrivelistdirectoryrequest.h"
namespace Cloud {
namespace GoogleDrive {
@@ -238,8 +239,9 @@ Networking::Request *GoogleDriveStorage::resolveFileId(Common::String path, Uplo
}
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;
+ if (!errorCallback) errorCallback = getErrorPrintingCallback();
+ if (!callback) callback = new Common::Callback<GoogleDriveStorage, FileArrayResponse>(this, &GoogleDriveStorage::printFiles);
+ return addRequest(new GoogleDriveListDirectoryRequest(this, path, callback, errorCallback, recursive));
}
Networking::Request *GoogleDriveStorage::listDirectoryById(Common::String id, ListDirectoryCallback callback, Networking::ErrorCallback errorCallback) {