From 2a4b25dd76899ac3e77bbf7885915b62bd1eaad4 Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Thu, 27 Aug 2015 22:23:06 -0700 Subject: [PATCH 1/2] Update names of ResourceRequest enums --- .../networking/src/AssetResourceRequest.cpp | 8 +++---- .../networking/src/FileResourceRequest.cpp | 6 ++--- .../networking/src/HTTPResourceRequest.cpp | 22 +++++++++---------- libraries/networking/src/ResourceCache.cpp | 10 ++++----- libraries/networking/src/ResourceRequest.cpp | 4 ++-- libraries/networking/src/ResourceRequest.h | 16 +++++++------- libraries/script-engine/src/BatchLoader.cpp | 2 +- libraries/script-engine/src/ScriptCache.cpp | 2 +- 8 files changed, 35 insertions(+), 35 deletions(-) diff --git a/libraries/networking/src/AssetResourceRequest.cpp b/libraries/networking/src/AssetResourceRequest.cpp index 80d4729466..2fa01d917e 100644 --- a/libraries/networking/src/AssetResourceRequest.cpp +++ b/libraries/networking/src/AssetResourceRequest.cpp @@ -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(); } }); diff --git a/libraries/networking/src/FileResourceRequest.cpp b/libraries/networking/src/FileResourceRequest.cpp index d8b8d962f5..87e5b5f08f 100644 --- a/libraries/networking/src/FileResourceRequest.cpp +++ b/libraries/networking/src/FileResourceRequest.cpp @@ -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::Error; emit finished(); } } diff --git a/libraries/networking/src/HTTPResourceRequest.cpp b/libraries/networking/src/HTTPResourceRequest.cpp index 22f55cd641..c61fe50f23 100644 --- a/libraries/networking/src/HTTPResourceRequest.cpp +++ b/libraries/networking/src/HTTPResourceRequest.cpp @@ -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(); } } diff --git a/libraries/networking/src/ResourceCache.cpp b/libraries/networking/src/ResourceCache.cpp index 884ddee00a..5598fda24a 100644 --- a/libraries/networking/src/ResourceCache.cpp +++ b/libraries/networking/src/ResourceCache.cpp @@ -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); diff --git a/libraries/networking/src/ResourceRequest.cpp b/libraries/networking/src/ResourceRequest.cpp index d56033670b..d10f50264f 100644 --- a/libraries/networking/src/ResourceRequest.cpp +++ b/libraries/networking/src/ResourceRequest.cpp @@ -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(); } diff --git a/libraries/networking/src/ResourceRequest.h b/libraries/networking/src/ResourceRequest.h index ac13523e96..d734c8caf1 100644 --- a/libraries/networking/src/ResourceRequest.h +++ b/libraries/networking/src/ResourceRequest.h @@ -21,16 +21,16 @@ 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, + NotFound }; void send(); @@ -50,7 +50,7 @@ protected: virtual void doSend() = 0; QUrl _url; - State _state { UNSENT }; + State _state { Unsent }; Result _result; QByteArray _data; bool _cacheEnabled { true }; diff --git a/libraries/script-engine/src/BatchLoader.cpp b/libraries/script-engine/src/BatchLoader.cpp index 01e4a5e869..dae8c8e739 100644 --- a/libraries/script-engine/src/BatchLoader.cpp +++ b/libraries/script-engine/src/BatchLoader.cpp @@ -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()); diff --git a/libraries/script-engine/src/ScriptCache.cpp b/libraries/script-engine/src/ScriptCache.cpp index e3d12313dc..9e04cd4ec3 100644 --- a/libraries/script-engine/src/ScriptCache.cpp +++ b/libraries/script-engine/src/ScriptCache.cpp @@ -63,7 +63,7 @@ void ScriptCache::scriptDownloaded() { QList 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(); From a7294eb0e5336fd26ed4a67ee2b2480ccb199f55 Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Thu, 27 Aug 2015 22:48:15 -0700 Subject: [PATCH 2/2] Add AccessDenied error for failure to open File in FileResourceRequest --- libraries/networking/src/FileResourceRequest.cpp | 2 +- libraries/networking/src/ResourceRequest.h | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/libraries/networking/src/FileResourceRequest.cpp b/libraries/networking/src/FileResourceRequest.cpp index 87e5b5f08f..261b1028f3 100644 --- a/libraries/networking/src/FileResourceRequest.cpp +++ b/libraries/networking/src/FileResourceRequest.cpp @@ -22,7 +22,7 @@ void FileResourceRequest::doSend() { _result = ResourceRequest::Success; emit finished(); } else { - _result = ResourceRequest::Error; + _result = ResourceRequest::AccessDenied; emit finished(); } } diff --git a/libraries/networking/src/ResourceRequest.h b/libraries/networking/src/ResourceRequest.h index d734c8caf1..055d32c1a5 100644 --- a/libraries/networking/src/ResourceRequest.h +++ b/libraries/networking/src/ResourceRequest.h @@ -23,14 +23,15 @@ public: enum State { Unsent = 0, InProgress, - Finished + Finished }; enum Result { Success, Error, Timeout, - NotFound + AccessDenied, + NotFound }; void send();