From db92e3155cf3bbefd2c7e298933ca773244a32fc Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Tue, 1 Sep 2015 09:39:30 -0700 Subject: [PATCH 1/2] Update AssetServerError enum to be camelcase --- assignment-client/src/assets/AssetServer.cpp | 6 +++--- assignment-client/src/assets/SendAssetTask.cpp | 8 ++++---- assignment-client/src/assets/UploadAssetTask.cpp | 4 ++-- libraries/networking/src/AssetResourceRequest.cpp | 2 +- libraries/networking/src/AssetUpload.cpp | 6 +++--- libraries/networking/src/AssetUtils.h | 10 +++++----- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/assignment-client/src/assets/AssetServer.cpp b/assignment-client/src/assets/AssetServer.cpp index 62f1b877b5..9d60b74508 100644 --- a/assignment-client/src/assets/AssetServer.cpp +++ b/assignment-client/src/assets/AssetServer.cpp @@ -113,11 +113,11 @@ void AssetServer::handleAssetGetInfo(QSharedPointer packet, SharedNode if (fileInfo.exists() && fileInfo.isReadable()) { qDebug() << "Opening file: " << fileInfo.filePath(); - replyPacket->writePrimitive(AssetServerError::NO_ERROR); + replyPacket->writePrimitive(AssetServerError::NoError); replyPacket->writePrimitive(fileInfo.size()); } else { qDebug() << "Asset not found: " << QString(hexHash); - replyPacket->writePrimitive(AssetServerError::ASSET_NOT_FOUND); + replyPacket->writePrimitive(AssetServerError::AssetNotFound); } auto nodeList = DependencyManager::get(); @@ -157,7 +157,7 @@ void AssetServer::handleAssetUpload(QSharedPointer packetList, Sha // write the message ID and a permission denied error permissionErrorPacket->writePrimitive(messageID); - permissionErrorPacket->writePrimitive(AssetServerError::PERMISSION_DENIED); + permissionErrorPacket->writePrimitive(AssetServerError::PermissionDenied); // send off the packet auto nodeList = DependencyManager::get(); diff --git a/assignment-client/src/assets/SendAssetTask.cpp b/assignment-client/src/assets/SendAssetTask.cpp index 8131bafaf3..1495a7b52e 100644 --- a/assignment-client/src/assets/SendAssetTask.cpp +++ b/assignment-client/src/assets/SendAssetTask.cpp @@ -55,7 +55,7 @@ void SendAssetTask::run() { replyPacketList->writePrimitive(messageID); if (end <= start) { - writeError(replyPacketList.get(), AssetServerError::INVALID_BYTE_RANGE); + writeError(replyPacketList.get(), AssetServerError::InvalidByteRange); } else { QString filePath = _resourcesDir.filePath(QString(hexHash) + "." + QString(extension)); @@ -63,12 +63,12 @@ void SendAssetTask::run() { if (file.open(QIODevice::ReadOnly)) { if (file.size() < end) { - writeError(replyPacketList.get(), AssetServerError::INVALID_BYTE_RANGE); + writeError(replyPacketList.get(), AssetServerError::InvalidByteRange); qCDebug(networking) << "Bad byte range: " << hexHash << " " << start << ":" << end; } else { auto size = end - start; file.seek(start); - replyPacketList->writePrimitive(AssetServerError::NO_ERROR); + replyPacketList->writePrimitive(AssetServerError::NoError); replyPacketList->writePrimitive(size); replyPacketList->write(file.read(size)); qCDebug(networking) << "Sending asset: " << hexHash; @@ -76,7 +76,7 @@ void SendAssetTask::run() { file.close(); } else { qCDebug(networking) << "Asset not found: " << filePath << "(" << hexHash << ")"; - writeError(replyPacketList.get(), AssetServerError::ASSET_NOT_FOUND); + writeError(replyPacketList.get(), AssetServerError::AssetNotFound); } } diff --git a/assignment-client/src/assets/UploadAssetTask.cpp b/assignment-client/src/assets/UploadAssetTask.cpp index d4991f9554..1acca295b4 100644 --- a/assignment-client/src/assets/UploadAssetTask.cpp +++ b/assignment-client/src/assets/UploadAssetTask.cpp @@ -52,7 +52,7 @@ void UploadAssetTask::run() { replyPacket->writePrimitive(messageID); if (fileSize > MAX_UPLOAD_SIZE) { - replyPacket->writePrimitive(AssetServerError::ASSET_TOO_LARGE); + replyPacket->writePrimitive(AssetServerError::AssetTooLarge); } else { QByteArray fileData = buffer.read(fileSize); @@ -71,7 +71,7 @@ void UploadAssetTask::run() { file.write(fileData); file.close(); } - replyPacket->writePrimitive(AssetServerError::NO_ERROR); + replyPacket->writePrimitive(AssetServerError::NoError); replyPacket->write(hash); } diff --git a/libraries/networking/src/AssetResourceRequest.cpp b/libraries/networking/src/AssetResourceRequest.cpp index d27151ac53..1ec52bede6 100644 --- a/libraries/networking/src/AssetResourceRequest.cpp +++ b/libraries/networking/src/AssetResourceRequest.cpp @@ -52,7 +52,7 @@ void AssetResourceRequest::doSend() { _data = req->getData(); _result = Success; break; - case ASSET_NOT_FOUND: + case AssetNotFound: _result = NotFound; break; default: diff --git a/libraries/networking/src/AssetUpload.cpp b/libraries/networking/src/AssetUpload.cpp index 33d1dcc33a..14e5354f0b 100644 --- a/libraries/networking/src/AssetUpload.cpp +++ b/libraries/networking/src/AssetUpload.cpp @@ -43,13 +43,13 @@ void AssetUpload::start() { assetClient->uploadAsset(data, _extension, [this](AssetServerError error, const QString& hash){ switch (error) { - case NO_ERROR: + case AssetServerError::NoError: _result = Success; break; - case ASSET_TOO_LARGE: + case AssetServerError::AssetTooLarge: _result = TooLarge; break; - case PERMISSION_DENIED: + case AssetServerError::PermissionDenied: _result = PermissionDenied; break; default: diff --git a/libraries/networking/src/AssetUtils.h b/libraries/networking/src/AssetUtils.h index ae6f51df64..de1083afa7 100644 --- a/libraries/networking/src/AssetUtils.h +++ b/libraries/networking/src/AssetUtils.h @@ -22,11 +22,11 @@ const size_t SHA256_HASH_HEX_LENGTH = 64; const uint64_t MAX_UPLOAD_SIZE = 1000 * 1000 * 1000; // 1GB enum AssetServerError : uint8_t { - NO_ERROR = 0, - ASSET_NOT_FOUND, - INVALID_BYTE_RANGE, - ASSET_TOO_LARGE, - PERMISSION_DENIED + NoError, + AssetNotFound, + InvalidByteRange, + AssetTooLarge, + PermissionDenied }; const QString ATP_SCHEME = "atp"; From 899b94eab3fcbe14d1c9164506229dc48222cb84 Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Tue, 1 Sep 2015 09:41:19 -0700 Subject: [PATCH 2/2] Add cstdint include to Asset* files --- libraries/networking/src/AssetClient.cpp | 2 ++ libraries/networking/src/AssetUpload.h | 2 ++ libraries/networking/src/AssetUtils.h | 2 ++ 3 files changed, 6 insertions(+) diff --git a/libraries/networking/src/AssetClient.cpp b/libraries/networking/src/AssetClient.cpp index 65806f3e96..dfa094ba78 100644 --- a/libraries/networking/src/AssetClient.cpp +++ b/libraries/networking/src/AssetClient.cpp @@ -14,6 +14,8 @@ #include #include +#include + #include "AssetRequest.h" #include "AssetUpload.h" #include "NodeList.h" diff --git a/libraries/networking/src/AssetUpload.h b/libraries/networking/src/AssetUpload.h index a678c0dc7e..0fef814a07 100644 --- a/libraries/networking/src/AssetUpload.h +++ b/libraries/networking/src/AssetUpload.h @@ -16,6 +16,8 @@ #include +#include + // You should be able to upload an asset from any thread, and handle the responses in a safe way // on your own thread. Everything should happen on AssetClient's thread, the caller should // receive events by connecting to signals on an object that lives on AssetClient's threads. diff --git a/libraries/networking/src/AssetUtils.h b/libraries/networking/src/AssetUtils.h index de1083afa7..7281678a10 100644 --- a/libraries/networking/src/AssetUtils.h +++ b/libraries/networking/src/AssetUtils.h @@ -14,6 +14,8 @@ #include +#include + using MessageID = uint32_t; using DataOffset = int64_t;