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

CLOUD: Add RequestInfo struct

Browse source 
ConnectionManager upgrade: it now contains a special struct for each
request, so you can access request status and data by request id.
This commit is contained in:
Alexander Tkachev 2016-05-26 17:56:13 +06:00
parent eda575a660
commit 62ccf1f902
10 changed files with 117 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

17
backends/cloud/downloadrequest.cpp
View file

@ -21,6 +21,7 @@
*/
#include "backends/cloud/downloadrequest.h"
#include "backends/networking/curl/connectionmanager.h"
#include "common/debug.h"
#include "common/textconsole.h"
@ -32,16 +33,19 @@ DownloadRequest::DownloadRequest(Storage::BoolCallback callback, Networking::Net
bool DownloadRequest::handle() {
if (!_remoteFileStream) {
warning("DownloadRequest: no stream to read");
ConnMan.getRequestInfo(_id).state = Networking::FINISHED;
return true;
}
if (!_localFile) {
warning("DownloadRequest: no file to write");
ConnMan.getRequestInfo(_id).state = Networking::FINISHED;
return true;
}
if (!_localFile->isOpen()) {
warning("DownloadRequest: failed to open file to write");
ConnMan.getRequestInfo(_id).state = Networking::FINISHED;
return true;
}
@ -52,7 +56,8 @@ bool DownloadRequest::handle() {
if (readBytes != 0)
if (_localFile->write(buf, readBytes) != readBytes) {
warning("DownloadRequest: unable to write all received bytes into output file");
if (_boolCallback) (*_boolCallback)(false);
ConnMan.getRequestInfo(_id).state = Networking::FINISHED;
if (_boolCallback) (*_boolCallback)(false);
return true;
}
@ -62,6 +67,7 @@ bool DownloadRequest::handle() {
//TODO: do something about it actually
}
ConnMan.getRequestInfo(_id).state = Networking::FINISHED;
if (_boolCallback) (*_boolCallback)(_remoteFileStream->httpResponseCode() == 200);
_localFile->close(); //yes, I know it's closed automatically in ~DumpFile()
@ -71,4 +77,13 @@ bool DownloadRequest::handle() {
return false;
}
void DownloadRequest::restart() {
//this request doesn't know anything about the _remoteFileStream it's reading
//thus, it can't restart it
warning("DownloadRequest: cannot be restarted");
ConnMan.getRequestInfo(_id).state = Networking::FINISHED;
if (_boolCallback) (*_boolCallback)(false);
//TODO: fix that
}
} //end of namespace Cloud