Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-21 19:04:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Add network error to AssetRequest

Browse source
This commit is contained in:
Ryan Huffman 2015-09-11 13:55:48 -07:00
parent 42b4c7d423
commit b564ceb76f
4 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libraries/networking/src/AssetRequest.cpp
View file

@ -19,8 +19,8 @@
#include "NetworkLogging.h"
#include "NodeList.h"
AssetRequest::AssetRequest(QObject* parent, const QString& hash, const QString& extension) :
QObject(parent),
AssetRequest::AssetRequest(const QString& hash, const QString& extension) :
QObject(),
_hash(hash),
_extension(extension)
{
@ -87,6 +87,9 @@ void AssetRequest::start() {
case AssetServerError::InvalidByteRange:
_error = InvalidByteRange;
break;
case AssetServerError::NetworkError:
_error = Error::NetworkError;
break;
default:
_error = UnknownError;
break;

3
libraries/networking/src/AssetRequest.h
View file

@ -35,10 +35,11 @@ public:
NotFound,
InvalidByteRange,
HashVerificationFailed,
NetworkError,
UnknownError
};
AssetRequest(QObject* parent, const QString& hash, const QString& extension);
AssetRequest(const QString& hash, const QString& extension);
Q_INVOKABLE void start();

4
libraries/networking/src/AssetResourceRequest.cpp
View file

@ -55,6 +55,10 @@ void AssetResourceRequest::doSend() {
case AssetRequest::Error::NotFound:
_result = NotFound;
break;
case AssetRequest::Error::NetworkError:
qDebug() << "Got a network error for asset resource request: " << _url.toString();
_result = ServerUnavailable;
break;
default:
_result = Error;
break;

5
libraries/networking/src/AssetUtils.h
View file

@ -24,11 +24,12 @@ const size_t SHA256_HASH_HEX_LENGTH = 64;
const uint64_t MAX_UPLOAD_SIZE = 1000 * 1000 * 1000; // 1GB
enum AssetServerError : uint8_t {
NoError,
NoError = 0,
AssetNotFound,
InvalidByteRange,
AssetTooLarge,
PermissionDenied
PermissionDenied,
NetworkError = 128
};
const QString ATP_SCHEME = "atp";