From e53e3d188b9da424af5e44e51bff265f077ce05e Mon Sep 17 00:00:00 2001 From: Alexander Tkachev Date: Tue, 24 May 2016 00:14:24 +0600 Subject: CLOUD: Add DropboxListDirectoryRequest Does multiple CurlJsonRequests while Dropbox returns "has_more" = true. --- .../cloud/dropbox/dropboxlistdirectoryrequest.cpp | 114 +++++++++++++++++++++ .../cloud/dropbox/dropboxlistdirectoryrequest.h | 51 +++++++++ backends/cloud/dropbox/dropboxstorage.cpp | 32 ++---- backends/cloud/dropbox/dropboxstorage.h | 2 + 4 files changed, 175 insertions(+), 24 deletions(-) create mode 100644 backends/cloud/dropbox/dropboxlistdirectoryrequest.cpp create mode 100644 backends/cloud/dropbox/dropboxlistdirectoryrequest.h (limited to 'backends/cloud/dropbox') diff --git a/backends/cloud/dropbox/dropboxlistdirectoryrequest.cpp b/backends/cloud/dropbox/dropboxlistdirectoryrequest.cpp new file mode 100644 index 0000000000..e28a445d63 --- /dev/null +++ b/backends/cloud/dropbox/dropboxlistdirectoryrequest.cpp @@ -0,0 +1,114 @@ +/* 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/dropbox/dropboxlistdirectoryrequest.h" +#include "backends/cloud/iso8601.h" +#include "backends/networking/curl/connectionmanager.h" +#include "backends/networking/curl/curljsonrequest.h" + +namespace Cloud { +namespace Dropbox { + +DropboxListDirectoryRequest::DropboxListDirectoryRequest(Common::String token, Common::String path, Storage::FileArrayCallback cb, bool recursive): + Networking::Request(0), _filesCallback(cb), _token(token), _complete(false) { + Common::BaseCallback<> *innerCallback = new Common::Callback(this, &DropboxListDirectoryRequest::responseCallback);//new Common::GlobalFunctionCallback(printJson); //okay + Networking::CurlJsonRequest *request = new Networking::CurlJsonRequest(innerCallback, "https://api.dropboxapi.com/2/files/list_folder"); + request->addHeader("Authorization: Bearer " + _token); + request->addHeader("Content-Type: application/json"); + + Common::JSONObject jsonRequestParameters; + jsonRequestParameters.setVal("path", new Common::JSONValue(path)); + jsonRequestParameters.setVal("recursive", new Common::JSONValue(recursive)); + jsonRequestParameters.setVal("include_media_info", new Common::JSONValue(false)); + jsonRequestParameters.setVal("include_deleted", new Common::JSONValue(false)); + + Common::JSONValue value(jsonRequestParameters); + request->addPostField(Common::JSON::stringify(&value)); + + ConnMan.addRequest(request); +} + +void DropboxListDirectoryRequest::responseCallback(void *jsonPtr) { + Common::JSONValue *json = (Common::JSONValue *)jsonPtr; + if (json) { + Common::JSONObject response = json->asObject(); + + if (response.contains("error") || response.contains("error_summary")) { + warning("Dropbox returned error: %s", response.getVal("error_summary")->asString().c_str()); + _complete = true; + delete json; + return; + } + + //TODO: check that all keys exist to avoid segfaults + //TODO: get more files in the folder to check "has_more" case + + Common::JSONArray items = response.getVal("entries")->asArray(); + for (uint32 i = 0; i < items.size(); ++i) { + Common::JSONObject item = items[i]->asObject(); + Common::String path = item.getVal("path_lower")->asString(); + bool isDirectory = (item.getVal(".tag")->asString() == "folder"); + uint32 size = 0, timestamp = 0; + if (!isDirectory) { + size = item.getVal("size")->asNumber(); + timestamp = ISO8601::convertToTimestamp(item.getVal("server_modified")->asString()); + } + _files.push_back(StorageFile(path, size, timestamp, isDirectory)); + } + + bool hasMore = response.getVal("has_more")->asBool(); + + if (hasMore) { + Common::BaseCallback<> *innerCallback = new Common::Callback(this, &DropboxListDirectoryRequest::responseCallback); + Networking::CurlJsonRequest *request = new Networking::CurlJsonRequest(innerCallback, "https://api.dropboxapi.com/2/files/list_folder/continue"); + request->addHeader("Authorization: Bearer " + _token); + request->addHeader("Content-Type: application/json"); + + Common::JSONObject jsonRequestParameters; + jsonRequestParameters.setVal("cursor", new Common::JSONValue(response.getVal("cursor")->asString())); + + Common::JSONValue value(jsonRequestParameters); + request->addPostField(Common::JSON::stringify(&value)); + + ConnMan.addRequest(request); + } else { + _complete = true; + } + } else { + warning("null, not json"); + _complete = true; + } + + delete json; +} + +bool DropboxListDirectoryRequest::handle() { + if (_complete && _filesCallback) { + (*_filesCallback)(_files); + } + + return _complete; +} + + +} //end of namespace Dropbox +} //end of namespace Cloud diff --git a/backends/cloud/dropbox/dropboxlistdirectoryrequest.h b/backends/cloud/dropbox/dropboxlistdirectoryrequest.h new file mode 100644 index 0000000000..03b4fc121a --- /dev/null +++ b/backends/cloud/dropbox/dropboxlistdirectoryrequest.h @@ -0,0 +1,51 @@ +/* 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_DROPBOX_DROPBOXLISTDIRECTORYREQUEST_H +#define BACKENDS_CLOUD_DROPBOX_DROPBOXLISTDIRECTORYREQUEST_H + +#include "backends/cloud/storage.h" +#include "common/callback.h" +#include "backends/networking/curl/request.h" + +namespace Cloud { +namespace Dropbox { + +class DropboxListDirectoryRequest: public Networking::Request { + Storage::FileArrayCallback _filesCallback; + Common::String _token; + bool _complete; + Common::Array _files; + + void responseCallback(void *jsonPtr); + +public: + DropboxListDirectoryRequest(Common::String token, Common::String path, Storage::FileArrayCallback cb, bool recursive = false); + virtual ~DropboxListDirectoryRequest() { delete _filesCallback; } + + virtual bool handle(); +}; + +} //end of namespace Dropbox +} //end of namespace Cloud + +#endif diff --git a/backends/cloud/dropbox/dropboxstorage.cpp b/backends/cloud/dropbox/dropboxstorage.cpp index 28d14c6a2e..6de9424efc 100644 --- a/backends/cloud/dropbox/dropboxstorage.cpp +++ b/backends/cloud/dropbox/dropboxstorage.cpp @@ -22,6 +22,7 @@ #define FORBIDDEN_SYMBOL_ALLOW_ALL #include "backends/cloud/dropbox/dropboxstorage.h" +#include "backends/cloud/dropbox/dropboxlistdirectoryrequest.h" #include "backends/networking/curl/connectionmanager.h" #include "backends/networking/curl/curljsonrequest.h" #include "common/config-manager.h" @@ -75,37 +76,20 @@ void DropboxStorage::saveConfig(Common::String keyPrefix) { ConfMan.set(keyPrefix + "user_id", _uid, "cloud"); } -void printJson(void *ptr) { - Common::JSONValue *json = (Common::JSONValue *)ptr; - if (json) { - debug("%s", json->stringify(true).c_str()); - } else { - warning("null, not json"); - } +void DropboxStorage::printFiles(Common::Array files) { + debug("files:"); + for (uint32 i = 0; i < files.size(); ++i) + debug("\t%s", files[i].name().c_str()); } void DropboxStorage::listDirectory(Common::String path, FileArrayCallback outerCallback, bool recursive) { - //Common::BaseCallback<> *innerCallback = new Common::CallbackBridge >(this, &DropboxStorage::listDirectoryInnerCallback, outerCallback); - Common::BaseCallback<> *innerCallback = new Common::GlobalFunctionCallback(printJson); //okay - Networking::CurlJsonRequest *request = new Networking::CurlJsonRequest(innerCallback, "https://api.dropboxapi.com/2/files/list_folder"); - request->addHeader("Authorization: Bearer " + _token); - request->addHeader("Content-Type: application/json"); - - Common::JSONObject jsonRequestParameters; - jsonRequestParameters.setVal("path", new Common::JSONValue(path)); - jsonRequestParameters.setVal("recursive", new Common::JSONValue(recursive)); - jsonRequestParameters.setVal("include_media_info", new Common::JSONValue(false)); - jsonRequestParameters.setVal("include_deleted", new Common::JSONValue(false)); - - Common::JSONValue value(jsonRequestParameters); - request->addPostField(Common::JSON::stringify(&value)); - - ConnMan.addRequest(request); + ConnMan.addRequest(new DropboxListDirectoryRequest(_token, path, outerCallback, recursive)); } void DropboxStorage::syncSaves(BoolCallback callback) { //this is not the real syncSaves() implementation - listDirectory("", 0); //"" is root in Dropbox, not "/" + //"" is root in Dropbox, not "/" + listDirectory("", new Common::Callback >(this, &DropboxStorage::printFiles), true); } void DropboxStorage::info(StorageInfoCallback outerCallback) { diff --git a/backends/cloud/dropbox/dropboxstorage.h b/backends/cloud/dropbox/dropboxstorage.h index 3077b98763..c1c2e03497 100644 --- a/backends/cloud/dropbox/dropboxstorage.h +++ b/backends/cloud/dropbox/dropboxstorage.h @@ -42,6 +42,8 @@ class DropboxStorage: public Cloud::Storage { /** Constructs StorageInfo based on JSON response from cloud. */ void infoInnerCallback(StorageInfoCallback outerCallback, void *json); + void printFiles(Common::Array files); + public: virtual ~DropboxStorage(); -- cgit v1.2.3