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

Merge pull request #33 from huffman/resource-req-naming

Browse source 
Resource req naming
This commit is contained in:
Stephen Birarda 2015-08-28 06:30:02 -07:00
commit 0ef459f7a9
8 changed files with 36 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -29,14 +29,14 @@ void AssetResourceRequest::doSend() {
connect(request, &AssetRequest::progress, this, &AssetResourceRequest::progress);
QObject::connect(request, &AssetRequest::finished, [this](AssetRequest* req) mutable {
if (_state != IN_PROGRESS) return;
_state = FINISHED;
if (_state != InProgress) return;
_state = Finished;
if (true) {
_data = req->getData();
_result = ResourceRequest::SUCCESS;
_result = ResourceRequest::Success;
emit finished();
} else {
_result = ResourceRequest::ERROR;
_result = ResourceRequest::Error;
emit finished();
}
});

6
libraries/networking/src/FileResourceRequest.cpp
View file

@ -16,13 +16,13 @@
void FileResourceRequest::doSend() {
QString filename = _url.toLocalFile();
QFile file(filename);
_state = FINISHED;
_state = Finished;
if (file.open(QFile::ReadOnly)) {
_data = file.readAll();
_result = ResourceRequest::SUCCESS;
_result = ResourceRequest::Success;
emit finished();
} else {
_result = ResourceRequest::ERROR;
_result = ResourceRequest::AccessDenied;
emit finished();
}
}

22
libraries/networking/src/HTTPResourceRequest.cpp
View file

@ -37,7 +37,7 @@ void HTTPResourceRequest::doSend() {
networkRequest.setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::PreferCache);
} else {
networkRequest.setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::AlwaysNetwork);
}
}
_reply = networkAccessManager.get(networkRequest);
@ -51,22 +51,22 @@ void HTTPResourceRequest::doSend() {
}
void HTTPResourceRequest::onRequestFinished() {
Q_ASSERT(_state == IN_PROGRESS);
Q_ASSERT(_state == InProgress);
Q_ASSERT(_reply);
_state = FINISHED;
_state = Finished;
auto error = _reply->error();
if (error == QNetworkReply::NoError) {
_data = _reply->readAll();
_loadedFromCache = _reply->attribute(QNetworkRequest::SourceIsFromCacheAttribute).toBool();
_result = ResourceRequest::SUCCESS;
_result = ResourceRequest::Success;
emit finished();
} else if (error == QNetworkReply::TimeoutError) {
_result = ResourceRequest::TIMEOUT;
_result = ResourceRequest::Timeout;
emit finished();
} else {
_result = ResourceRequest::ERROR;
_result = ResourceRequest::Error;
emit finished();
}
@ -75,7 +75,7 @@ void HTTPResourceRequest::onRequestFinished() {
}
void HTTPResourceRequest::onDownloadProgress(qint64 bytesReceived, qint64 bytesTotal) {
if (_state == IN_PROGRESS) {
if (_state == InProgress) {
// We've received data, so reset the timer
_sendTimer.start();
}
@ -84,13 +84,13 @@ void HTTPResourceRequest::onDownloadProgress(qint64 bytesReceived, qint64 bytesT
}
void HTTPResourceRequest::onTimeout() {
Q_ASSERT(_state != UNSENT);
Q_ASSERT(_state != Unsent);
if (_state == IN_PROGRESS) {
if (_state == InProgress) {
qCDebug(networking) << "Timed out loading " << _url;
_reply->abort();
_state = FINISHED;
_result = TIMEOUT;
_state = Finished;
_result = Timeout;
emit finished();
}
}

10
libraries/networking/src/ResourceCache.cpp
View file

@ -368,7 +368,7 @@ void Resource::handleReplyFinished() {
Q_ASSERT(_request);
auto result = _request->getResult();
if (result == ResourceRequest::SUCCESS) {
if (result == ResourceRequest::Success) {
_data = _request->getData();
qDebug() << "Request finished for " << _url << ", " << _activeUrl;
@ -386,7 +386,7 @@ void Resource::handleReplyFinished() {
_request->deleteLater();
_request = nullptr;
if (result == ResourceRequest::Result::TIMEOUT) {
if (result == ResourceRequest::Result::Timeout) {
qDebug() << "Timed out loading" << _url << "received" << _bytesReceived << "total" << _bytesTotal;
} else {
qDebug() << "Error loading " << _url;
@ -394,8 +394,8 @@ void Resource::handleReplyFinished() {
bool retry = false;
switch (result) {
case ResourceRequest::Result::TIMEOUT:
case ResourceRequest::Result::ERROR: {
case ResourceRequest::Result::Timeout:
case ResourceRequest::Result::Error: {
// retry with increasing delays
const int MAX_ATTEMPTS = 8;
const int BASE_DELAY_MS = 1000;
@ -411,7 +411,7 @@ void Resource::handleReplyFinished() {
break;
}
auto error = result == ResourceRequest::TIMEOUT ? QNetworkReply::TimeoutError : QNetworkReply::UnknownNetworkError;
auto error = result == ResourceRequest::Timeout ? QNetworkReply::TimeoutError : QNetworkReply::UnknownNetworkError;
if (!retry) {
emit failed(error);

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

@ -17,8 +17,8 @@ ResourceRequest::ResourceRequest(QObject* parent, const QUrl& url) :
}
void ResourceRequest::send() {
Q_ASSERT(_state == UNSENT);
Q_ASSERT(_state == Unsent);
_state = IN_PROGRESS;
_state = InProgress;
doSend();
}

17
libraries/networking/src/ResourceRequest.h
View file

@ -21,16 +21,17 @@ public:
ResourceRequest(QObject* parent, const QUrl& url);
enum State {
UNSENT = 0,
IN_PROGRESS,
FINISHED
Unsent = 0,
InProgress,
Finished
};
enum Result {
SUCCESS,
ERROR,
TIMEOUT,
NOT_FOUND
Success,
Error,
Timeout,
AccessDenied,
NotFound
};
void send();
@ -50,7 +51,7 @@ protected:
virtual void doSend() = 0;
QUrl _url;
State _state { UNSENT };
State _state { Unsent };
Result _result;
QByteArray _data;
bool _cacheEnabled { true };

2
libraries/script-engine/src/BatchLoader.cpp
View file

@ -40,7 +40,7 @@ void BatchLoader::start() {
continue;
}
connect(request, &ResourceRequest::finished, this, [=]() {
if (request->getResult() == ResourceRequest::SUCCESS) {
if (request->getResult() == ResourceRequest::Success) {
_data.insert(url, request->getData());
} else {
_data.insert(url, QString());

2
libraries/script-engine/src/ScriptCache.cpp
View file

@ -63,7 +63,7 @@ void ScriptCache::scriptDownloaded() {
QList<ScriptUser*> scriptUsers = _scriptUsers.values(url);
_scriptUsers.remove(url);
if (req->getResult() == ResourceRequest::SUCCESS) {
if (req->getResult() == ResourceRequest::Success) {
_scriptCache[url] = req->getData();
qCDebug(scriptengine) << "Done downloading script at:" << url.toString();