CLOUD: Add OneDriveUploadRequest

Doesn't support server's requested ranges yet. Commit also adds some PUT-related code in NetworkReadStream and CurlRequest.
2016-05-31 14:18:32 +06:00 · 2016-05-31 14:18:32 +06:00 · b39f46788a
commit b39f46788a
parent eb63b50b7f
14 changed files with 354 additions and 33 deletions
--- a/backends/cloud/onedrive/onedriveuploadrequest.cpp
+++ b/backends/cloud/onedrive/onedriveuploadrequest.cpp
@ -0,0 +1,171 @@
+/* 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/onedrive/onedriveuploadrequest.h"
+#include "backends/cloud/onedrive/onedrivestorage.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 "common/debug.h"
+#include "onedrivetokenrefresher.h"
+
+namespace Cloud {
+namespace OneDrive {
+
+OneDriveUploadRequest::OneDriveUploadRequest(OneDriveStorage *storage, 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();
+}
+
+OneDriveUploadRequest::~OneDriveUploadRequest() {
+	_ignoreCallback = true;
+	if (_workingRequest) _workingRequest->finish();
+	delete _contentsStream;
+	delete _uploadCallback;
+}
+
+void OneDriveUploadRequest::start() {
+	_ignoreCallback = true;
+	if (_workingRequest) _workingRequest->finish();
+	if (!_contentsStream->seek(0)) {
+		warning("OneDriveUploadRequest: cannot restart because stream couldn't seek(0)");
+		finishError(Networking::ErrorResponse(this, false, true, "", -1));
+	}
+	_ignoreCallback = false;
+
+	uploadNextPart();
+}
+
+void OneDriveUploadRequest::uploadNextPart() {	
+	const uint32 UPLOAD_PER_ONE_REQUEST = 10 * 1024 * 1024;
+
+	if (_uploadUrl == "" && _contentsStream->size() > UPLOAD_PER_ONE_REQUEST) {
+		Common::String url = "https://api.onedrive.com/v1.0/drive/special/approot:/"+_savePath+":/upload.createSession"; //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::CurlJsonRequest *request = new OneDriveTokenRefresher(_storage, callback, failureCallback, url.c_str());
+		request->addHeader("Authorization: Bearer " + _storage->accessToken());
+		request->setBuffer(new byte[1], 0); //use POST
+		_workingRequest = ConnMan.addRequest(request);
+		return;
+	}
+
+	Common::String url;
+	if (_uploadUrl == "") {		
+		url = "https://api.onedrive.com/v1.0/drive/special/approot:/"+_savePath+":/content";
+	} else {		
+		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::CurlJsonRequest *request = new OneDriveTokenRefresher(_storage, callback, failureCallback, url.c_str());
+	request->addHeader("Authorization: Bearer " + _storage->accessToken());	
+	request->usePut();
+
+	uint32 oldPos = _contentsStream->pos();
+
+	byte *buffer = new byte[UPLOAD_PER_ONE_REQUEST];
+	uint32 size = _contentsStream->read(buffer, UPLOAD_PER_ONE_REQUEST);
+	request->setBuffer(buffer, size);
+
+	//request->addHeader(Common::String::format("Content-Length: %u", size));
+	if (_uploadUrl != "")
+		request->addHeader(Common::String::format("Content-Range: bytes %u-%u/%u", oldPos, _contentsStream->pos()-1, _contentsStream->size()));	;
+	
+	_workingRequest = ConnMan.addRequest(request);
+}
+
+void OneDriveUploadRequest::partUploadedCallback(Networking::JsonResponse response) {	
+	_workingRequest = nullptr;
+	if (_ignoreCallback) return;
+	
+	Networking::ErrorResponse error(this, false, true, "", -1);
+	Networking::CurlJsonRequest *rq = (Networking::CurlJsonRequest *)response.request;
+	if (rq && rq->getNetworkReadStream())
+		error.httpResponseCode = rq->getNetworkReadStream()->httpResponseCode();		
+
+	Common::JSONValue *json = response.value;
+	if (json) {
+		if (json->isObject()) {
+			Common::JSONObject object = json->asObject();
+
+			if (object.contains("error")) {
+				warning("OneDrive returned error: %s", json->stringify(true).c_str());
+				delete json;
+				error.response = json->stringify(true);
+				finishError(error);
+				return;
+			}
+
+			if (object.contains("id") && object.contains("name")) {
+				//finished				
+				Common::String path = _savePath; //object.getVal("name")->asString();; //object.getVal("id")->asString();
+				uint32 size = object.getVal("size")->asIntegerNumber();
+				uint32 timestamp = ISO8601::convertToTimestamp(object.getVal("lastModifiedDateTime")->asString());
+				finishSuccess(StorageFile(path, size, timestamp, false));
+				return;
+			}
+
+			if (_uploadUrl == "") {
+				if (object.contains("uploadUrl"))
+					_uploadUrl = object.getVal("uploadUrl")->asString();
+				else
+					warning("no uploadUrl found in OneDrive's response");				
+			}
+		}
+
+		if (_contentsStream->eos() || _contentsStream->pos() >= _contentsStream->size() - 1) {
+			warning("no file info to return");
+			finishSuccess(StorageFile(_savePath, 0, 0, false));
+		} else {
+			uploadNextPart();
+		}
+	} else {
+		warning("null, not json");		
+		finishError(error);
+	}
+
+	delete json;
+}
+
+void OneDriveUploadRequest::partUploadedErrorCallback(Networking::ErrorResponse error) {	
+	_workingRequest = nullptr;
+	if (_ignoreCallback) return;
+	finishError(error);
+}
+
+void OneDriveUploadRequest::handle() {}
+
+void OneDriveUploadRequest::restart() { start(); }
+
+void OneDriveUploadRequest::finishSuccess(StorageFile file) {
+	Request::finishSuccess();
+	if (_uploadCallback) (*_uploadCallback)(Storage::UploadResponse(this, file));
+}
+
+} // End of namespace OneDrive
+} // End of namespace Cloud