thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

CLOUD: Make OneDriveStorage::download() work fine

Browse source 
Well, it takes two API calls instead of one now, but there are no
problems with expired token because of it.

This commit changes Storage::streamFile() to pass NetworkReadStream *
through callback.
This commit is contained in:
Alexander Tkachev 2016-05-27 01:09:10 +06:00
parent 24007c029b
commit 83b349a033
13 changed files with 77 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

24
backends/cloud/downloadrequest.cpp
View file

@ -27,25 +27,39 @@
namespace Cloud {
DownloadRequest::DownloadRequest(Storage::BoolCallback callback, Networking::NetworkReadStream *stream, Common::DumpFile *dumpFile):
Request(0), _boolCallback(callback), _remoteFileStream(stream), _localFile(dumpFile) {}
DownloadRequest::DownloadRequest(Storage *storage, Storage::BoolCallback callback, Common::String remoteFile, Common::DumpFile *dumpFile):
Request(0), _boolCallback(callback), _remoteFileStream(0), _localFile(dumpFile) {
storage->streamFile(remoteFile, new Common::Callback<DownloadRequest, Storage::RequestReadStreamPair>(this, &DownloadRequest::streamCallback));
}
void DownloadRequest::handle() {
if (!_remoteFileStream) {
warning("DownloadRequest: no stream to read");
void DownloadRequest::streamCallback(Storage::RequestReadStreamPair pair) {
if (!pair.value) {
warning("DownloadRequest: no ReadStream passed");
ConnMan.getRequestInfo(_id).state = Networking::FINISHED;
if (_boolCallback) (*_boolCallback)(Storage::RequestBoolPair(_id, false));
return;
}
_remoteFileStream = (Networking::NetworkReadStream *)pair.value;
}
void DownloadRequest::handle() {
if (!_localFile) {
warning("DownloadRequest: no file to write");
ConnMan.getRequestInfo(_id).state = Networking::FINISHED;
if (_boolCallback) (*_boolCallback)(Storage::RequestBoolPair(_id, false));
return;
}
if (!_localFile->isOpen()) {
warning("DownloadRequest: failed to open file to write");
ConnMan.getRequestInfo(_id).state = Networking::FINISHED;
if (_boolCallback) (*_boolCallback)(Storage::RequestBoolPair(_id, false));
return;
}
if (!_remoteFileStream) {
//waiting for callback
return;
}

3
backends/cloud/downloadrequest.h
View file

@ -35,8 +35,9 @@ class DownloadRequest: public Networking::Request {
Networking::NetworkReadStream *_remoteFileStream;
Common::DumpFile *_localFile;
void streamCallback(Storage::RequestReadStreamPair pair);
public:
DownloadRequest(Storage::BoolCallback callback, Networking::NetworkReadStream *stream, Common::DumpFile *dumpFile);
DownloadRequest(Storage *storage, Storage::BoolCallback callback, Common::String remoteFile, Common::DumpFile *dumpFile);
virtual ~DownloadRequest() { delete _localFile; }
virtual void handle();

8
backends/cloud/dropbox/dropboxstorage.cpp
View file

@ -88,7 +88,7 @@ int32 DropboxStorage::listDirectory(Common::String path, FileArrayCallback outer
return ConnMan.addRequest(new DropboxListDirectoryRequest(_token, path, outerCallback, recursive));
}
Networking::NetworkReadStream *DropboxStorage::streamFile(Common::String path) {
int32 DropboxStorage::streamFile(Common::String path, ReadStreamCallback callback) {
Common::JSONObject jsonRequestParameters;
jsonRequestParameters.setVal("path", new Common::JSONValue(path));
Common::JSONValue value(jsonRequestParameters);
@ -98,7 +98,9 @@ Networking::NetworkReadStream *DropboxStorage::streamFile(Common::String path) {
request->addHeader("Dropbox-API-Arg: " + Common::JSON::stringify(&value));
request->addHeader("Content-Type: "); //required to be empty (as we do POST, it's usually app/form-url-encoded)
return request->execute();
RequestReadStreamPair pair = request->execute();
if (callback) (*callback)(pair);
return pair.id;
}
int32 DropboxStorage::download(Common::String remotePath, Common::String localPath, BoolCallback callback) {
@ -110,7 +112,7 @@ int32 DropboxStorage::download(Common::String remotePath, Common::String localPa
return -1;
}
return ConnMan.addRequest(new DownloadRequest(callback, streamFile(remotePath), f));
return ConnMan.addRequest(new DownloadRequest(this, callback, remotePath, f));
}
int32 DropboxStorage::syncSaves(BoolCallback callback) {

2
backends/cloud/dropbox/dropboxstorage.h
View file

@ -71,7 +71,7 @@ public:
virtual int32 upload(Common::String path, Common::ReadStream *contents, BoolCallback callback) { return -1; } //TODO
/** Returns pointer to Networking::NetworkReadStream. */
virtual Networking::NetworkReadStream *streamFile(Common::String path);
virtual int32 streamFile(Common::String path, ReadStreamCallback callback);
/** Calls the callback when finished. */
virtual int32 download(Common::String remotePath, Common::String localPath, BoolCallback callback);

37
backends/cloud/onedrive/onedrivestorage.cpp
View file

@ -126,14 +126,35 @@ void OneDriveStorage::printJson(Networking::RequestJsonPair pair) {
delete json;
}
Networking::NetworkReadStream *OneDriveStorage::streamFile(Common::String path) {
Common::String url = "https://api.onedrive.com/v1.0/drive/special/approot:/" + path + ":/content";
//NOT USING OneDriveTokenRefresher, because it's CurlJsonRequest, which saves all contents in memory to parse as JSON
//we actually don't even need a token if the download is "pre-authenticated" (whatever it means)
//still, we'd have to know direct URL (might be found in Item's "@content.downloadUrl", received from the server)
Networking::CurlRequest *request = new Networking::CurlRequest(0, url.c_str());
void OneDriveStorage::fileInfoCallback(ReadStreamCallback outerCallback, Networking::RequestJsonPair pair) {
if (!pair.value) {
warning("fileInfoCallback: NULL");
if (outerCallback) (*outerCallback)(RequestReadStreamPair(pair.id, 0));
return;
}
Common::JSONObject result = pair.value->asObject();
if (result.contains("@content.downloadUrl")) {
const char *url = result.getVal("@content.downloadUrl")->asString().c_str();
if (outerCallback)
(*outerCallback)(RequestReadStreamPair(
pair.id,
new Networking::NetworkReadStream(url, 0, "")
));
} else {
warning("downloadUrl not found in passed JSON");
debug("%s", pair.value->stringify().c_str());
if (outerCallback) (*outerCallback)(RequestReadStreamPair(pair.id, 0));
}
delete pair.value;
}
int32 OneDriveStorage::streamFile(Common::String path, ReadStreamCallback outerCallback) {
Common::String url = "https://api.onedrive.com/v1.0/drive/special/approot:/" + path + ":/";
Networking::JsonCallback innerCallback = new Common::CallbackBridge<OneDriveStorage, RequestReadStreamPair, Networking::RequestJsonPair>(this, &OneDriveStorage::fileInfoCallback, outerCallback);
Networking::CurlJsonRequest *request = new OneDriveTokenRefresher(this, innerCallback, url.c_str());
request->addHeader("Authorization: Bearer " + _token);
return request->execute();
return ConnMan.addRequest(request);
}
int32 OneDriveStorage::download(Common::String remotePath, Common::String localPath, BoolCallback callback) {
@ -145,7 +166,7 @@ int32 OneDriveStorage::download(Common::String remotePath, Common::String localP
return -1;
}
return ConnMan.addRequest(new DownloadRequest(callback, streamFile(remotePath), f));
return ConnMan.addRequest(new DownloadRequest(this, callback, remotePath, f));
}
void OneDriveStorage::fileDownloaded(RequestBoolPair pair) {

4
backends/cloud/onedrive/onedrivestorage.h
View file

@ -49,6 +49,8 @@ class OneDriveStorage: public Cloud::Storage {
void printJson(Networking::RequestJsonPair pair);
void fileDownloaded(RequestBoolPair pair);
void fileInfoCallback(ReadStreamCallback outerCallback, Networking::RequestJsonPair pair);
public:
virtual ~OneDriveStorage();
@ -75,7 +77,7 @@ public:
virtual int32 upload(Common::String path, Common::ReadStream *contents, BoolCallback callback) { return -1; } //TODO
/** Returns pointer to Networking::NetworkReadStream. */
virtual int32 streamFile(Common::String path);
virtual int32 streamFile(Common::String path, ReadStreamCallback callback);
/** Calls the callback when finished. */
virtual int32 download(Common::String remotePath, Common::String localPath, BoolCallback callback);

2
backends/cloud/onedrive/onedrivetokenrefresher.cpp
View file

@ -109,7 +109,7 @@ void OneDriveTokenRefresher::restart() {
if (_jsonCallback) (*_jsonCallback)(Networking::RequestJsonPair(_id, 0));
}
Networking::NetworkReadStream *OneDriveTokenRefresher::execute() {
Cloud::Storage::RequestReadStreamPair OneDriveTokenRefresher::execute() {
if (!_started) {
for (uint32 i = 0; i < _headers.size(); ++i)
_innerRequest->addHeader(_headers[i]);

2
backends/cloud/onedrive/onedrivetokenrefresher.h
View file

@ -52,7 +52,7 @@ public:
virtual void setHeaders(Common::Array<Common::String> &headers) { _headers = headers; }
virtual void addHeader(Common::String header) { _headers.push_back(header); }
virtual void addPostField(Common::String field) { _innerRequest->addPostField(field); }
virtual Networking::NetworkReadStream *execute();
virtual Cloud::Storage::RequestReadStreamPair execute();
};
} //end of namespace OneDrive

4
backends/cloud/storage.h
View file

@ -37,7 +37,7 @@ namespace Cloud {
class Storage {
public:
typedef Networking::RequestIdPair<Common::Array<StorageFile>&> RequestFileArrayPair;
typedef Networking::RequestIdPair<Common::ReadStream *> RequestReadStreamPair;
typedef Networking::RequestIdPair<Networking::NetworkReadStream *> RequestReadStreamPair;
typedef Networking::RequestIdPair<StorageInfo> RequestStorageInfoPair;
typedef Networking::RequestIdPair<bool> RequestBoolPair;
@ -78,7 +78,7 @@ public:
virtual int32 upload(Common::String path, Common::ReadStream *contents, BoolCallback callback) = 0;
/** Returns pointer to Networking::NetworkReadStream. */
virtual Networking::NetworkReadStream *streamFile(Common::String path) = 0; //TODO: return int32 somehow
virtual int32 streamFile(Common::String path, ReadStreamCallback callback) = 0;
/** Calls the callback when finished. */
virtual int32 download(Common::String remotePath, Common::String localPath, BoolCallback callback) = 0;

4
backends/networking/curl/curljsonrequest.cpp
View file

@ -31,7 +31,7 @@
namespace Networking {
CurlJsonRequest::CurlJsonRequest(JsonCallback cb, const char *url):
CurlJsonRequest::CurlJsonRequest(JsonCallback cb, Common::String url):
CurlRequest(0, url), _jsonCallback(cb), _contentsStream(DisposeAfterUse::YES) {}
CurlJsonRequest::~CurlJsonRequest() {}
@ -55,7 +55,7 @@ char *CurlJsonRequest::getPreparedContents() {
}
void CurlJsonRequest::handle() {
if (!_stream) _stream = new NetworkReadStream(_url, _headersList, _postFields);
if (!_stream) _stream = new NetworkReadStream(_url.c_str(), _headersList, _postFields);
if (_stream) {
const int kBufSize = 16*1024;

2
backends/networking/curl/curljsonrequest.h
View file

@ -42,7 +42,7 @@ class CurlJsonRequest: public CurlRequest {
char *getPreparedContents();
public:
CurlJsonRequest(JsonCallback cb, const char *url);
CurlJsonRequest(JsonCallback cb, Common::String url);
virtual ~CurlJsonRequest();
virtual void handle();

10
backends/networking/curl/curlrequest.cpp
View file

@ -30,7 +30,7 @@
namespace Networking {
CurlRequest::CurlRequest(DataCallback cb, const char *url):
CurlRequest::CurlRequest(DataCallback cb, Common::String url):
Request(cb), _url(url), _stream(0), _headersList(0) {}
CurlRequest::~CurlRequest() {
@ -38,7 +38,7 @@ CurlRequest::~CurlRequest() {
}
void CurlRequest::handle() {
if (!_stream) _stream = new NetworkReadStream(_url, _headersList, _postFields);
if (!_stream) _stream = new NetworkReadStream(_url.c_str(), _headersList, _postFields);
if (_stream && _stream->eos()) {
if (_stream->httpResponseCode() != 200)
@ -71,13 +71,13 @@ void CurlRequest::addPostField(Common::String keyValuePair) {
_postFields += "&" + keyValuePair;
}
NetworkReadStream *CurlRequest::execute() {
Cloud::Storage::RequestReadStreamPair CurlRequest::execute() {
if (!_stream) {
_stream = new NetworkReadStream(_url, _headersList, _postFields);
_stream = new NetworkReadStream(_url.c_str(), _headersList, _postFields);
ConnMan.addRequest(this);
}
return _stream;
return Cloud::Storage::RequestReadStreamPair(_id, _stream);
}
} //end of namespace Networking

11
backends/networking/curl/curlrequest.h
View file

@ -24,8 +24,9 @@
#define BACKENDS_NETWORKING_CURL_CURLREQUEST_H
#include "backends/networking/curl/request.h"
#include "backends/cloud/storage.h"
#include "common/str.h"
#include <common/array.h>
#include "common/array.h"
struct curl_slist;
@ -35,13 +36,13 @@ class NetworkReadStream;
class CurlRequest: public Request {
protected:
const char *_url;
Common::String _url;
NetworkReadStream *_stream;
curl_slist *_headersList;
Common::String _postFields;
public:
CurlRequest(DataCallback cb, const char *url);
CurlRequest(DataCallback cb, Common::String url);
virtual ~CurlRequest();
virtual void handle();
@ -51,8 +52,8 @@ public:
virtual void addHeader(Common::String header);
virtual void addPostField(Common::String field);
/** Start this Request with ConnMan. Returns its ReadStream. */
virtual NetworkReadStream *execute();
/** Start this Request with ConnMan. Returns its ReadStream and request id. */
virtual Cloud::Storage::RequestReadStreamPair execute();
};
} //end of namespace Networking