aboutsummaryrefslogtreecommitdiff
path: root/backends/networking/curl/curljsonrequest.cpp
diff options
context:
space:
mode:
authorAlexander Tkachev2016-05-18 14:08:05 +0600
committerAlexander Tkachev2016-08-24 16:07:55 +0600
commite743a65636a674def45e955cb7a5632aead2a033 (patch)
treedf7e6a3d3ea4e612e9810693349bffadbbc2c399 /backends/networking/curl/curljsonrequest.cpp
parent5df8c5140292520bafe92efa94935a776d63d108 (diff)
downloadscummvm-rg350-e743a65636a674def45e955cb7a5632aead2a033.tar.gz
scummvm-rg350-e743a65636a674def45e955cb7a5632aead2a033.tar.bz2
scummvm-rg350-e743a65636a674def45e955cb7a5632aead2a033.zip
CLOUD: Add Dropbox into CloudManager's configs
This commit adds: * ConfMan's new "cloud" domain; * CloudManager's init() method, where it loads keys from "cloud" configs domain; * CurlJsonRequest's addHeader() and addPostField() methods; * temporary Storage's printInfo() method; * DropboxStorage's implementation of printInfo(), which is using access token and user id; * DropboxStorage's loadFromConfig() static method to load access token and user id from configs and create a Storage instance with those; * temporary DropboxStorage's authThroughConsole() static method, which guides user through auth process from the console. So, in CloudManager's init() implementation ScummVM checks that there is "current_storage_type" key in "cloud" domain of configs, and loads corresponding storage if there is such key. If there is no such key, ScummVM offers user to auth with Dropbox. That's done through console, and thus it's temporary (it also requires restarting ScummVM twice and manually editing config.ini file).
Diffstat (limited to 'backends/networking/curl/curljsonrequest.cpp')
-rw-r--r--backends/networking/curl/curljsonrequest.cpp16
1 files changed, 14 insertions, 2 deletions
diff --git a/backends/networking/curl/curljsonrequest.cpp b/backends/networking/curl/curljsonrequest.cpp
index f5a7a7c8d0..0c6363467a 100644
--- a/backends/networking/curl/curljsonrequest.cpp
+++ b/backends/networking/curl/curljsonrequest.cpp
@@ -30,7 +30,7 @@
namespace Networking {
-CurlJsonRequest::CurlJsonRequest(Callback cb, const char *url) : Request(cb), _stream(0), _contentsStream(DisposeAfterUse::YES) {
+CurlJsonRequest::CurlJsonRequest(Callback cb, const char *url) : Request(cb), _stream(0), _headersList(0), _contentsStream(DisposeAfterUse::YES) {
_url = url;
}
@@ -57,7 +57,7 @@ char *CurlJsonRequest::getPreparedContents() {
}
bool CurlJsonRequest::handle(ConnectionManager &manager) {
- if (!_stream) _stream = manager.makeRequest(_url);
+ if (!_stream) _stream = manager.makeRequest(_url, _headersList, _postFields);
if (_stream) {
const int kBufSize = 16*1024;
@@ -83,4 +83,16 @@ bool CurlJsonRequest::handle(ConnectionManager &manager) {
return false;
}
+void CurlJsonRequest::addHeader(Common::String header) {
+ _headersList = curl_slist_append(_headersList, header.c_str());
+}
+
+void CurlJsonRequest::addPostField(Common::String keyValuePair) {
+ if (_postFields == "")
+ _postFields = keyValuePair;
+ else
+ _postFields += "&" + keyValuePair;
+}
+
+
} //end of namespace Networking