Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-10 03:07:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #86 from birarda/atp-mappings

Browse source 
disable client caching of ATP mappings, fix bug retreiving assets
This commit is contained in:
Clément Brisset 2016-03-09 14:40:57 -08:00
commit aeee89eb15
4 changed files with 1 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
assignment-client/src/assets/AssetServer.cpp
View file

@ -220,12 +220,10 @@ void AssetServer::handleGetMappingOperation(ReceivedMessage& message, SharedNode
auto it = _fileMappings.find(assetPath); auto it = _fileMappings.find(assetPath);
if (it != _fileMappings.end()) { if (it != _fileMappings.end()) {
auto assetHash = it->toString(); auto assetHash = it->toString();
qDebug() << "Found mapping for: " << assetPath << "=>" << assetHash;
replyPacket.writePrimitive(AssetServerError::NoError); replyPacket.writePrimitive(AssetServerError::NoError);
replyPacket.write(QByteArray::fromHex(assetHash.toUtf8())); replyPacket.write(QByteArray::fromHex(assetHash.toUtf8()));
} }
else { else {
qDebug() << "Mapping not found for: " << assetPath;
replyPacket.writePrimitive(AssetServerError::AssetNotFound); replyPacket.writePrimitive(AssetServerError::AssetNotFound);
} }
} }
@ -314,7 +312,7 @@ void AssetServer::handleAssetGetInfo(QSharedPointer<ReceivedMessage> message, Sh
replyPacket->write(assetHash); replyPacket->write(assetHash);
QString fileName = QString(hexHash); QString fileName = QString(hexHash);
QFileInfo fileInfo { _resourcesDirectory.filePath(fileName) }; QFileInfo fileInfo { _filesDirectory.filePath(fileName) };
if (fileInfo.exists() && fileInfo.isReadable()) { if (fileInfo.exists() && fileInfo.isReadable()) {
qDebug() << "Opening file: " << fileInfo.filePath(); qDebug() << "Opening file: " << fileInfo.filePath();

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

@ -91,8 +91,6 @@ void AssetClient::clearCache() {
return; return;
} }
_mappingCache.clear();
if (auto cache = NetworkAccessManager::getInstance().cache()) { if (auto cache = NetworkAccessManager::getInstance().cache()) {
qDebug() << "AssetClient::clearCache(): Clearing disk cache."; qDebug() << "AssetClient::clearCache(): Clearing disk cache.";
cache->clear(); cache->clear();
@ -578,6 +576,4 @@ void AssetClient::handleNodeKilled(SharedNodePointer node) {
messageMapIt->second.clear(); messageMapIt->second.clear();
} }
} }
_mappingCache.clear();
} }

2
libraries/networking/src/AssetClient.h
View file

@ -95,8 +95,6 @@ private:
std::unordered_map<SharedNodePointer, std::unordered_map<MessageID, GetInfoCallback>> _pendingInfoRequests; std::unordered_map<SharedNodePointer, std::unordered_map<MessageID, GetInfoCallback>> _pendingInfoRequests;
std::unordered_map<SharedNodePointer, std::unordered_map<MessageID, UploadResultCallback>> _pendingUploads; std::unordered_map<SharedNodePointer, std::unordered_map<MessageID, UploadResultCallback>> _pendingUploads;
QHash<QString, QString> _mappingCache;
friend class AssetRequest; friend class AssetRequest;
friend class AssetUpload; friend class AssetUpload;
friend class GetMappingRequest; friend class GetMappingRequest;

28
libraries/networking/src/MappingRequest.cpp
View file

@ -32,14 +32,6 @@ void GetMappingRequest::doStart() {
auto assetClient = DependencyManager::get<AssetClient>(); auto assetClient = DependencyManager::get<AssetClient>();
// Check cache
auto it = assetClient->_mappingCache.constFind(_path);
if (it != assetClient->_mappingCache.constEnd()) {
_hash = it.value();
emit finished(this);
return;
}
assetClient->getAssetMapping(_path, [this, assetClient](bool responseReceived, AssetServerError error, QSharedPointer<ReceivedMessage> message) { assetClient->getAssetMapping(_path, [this, assetClient](bool responseReceived, AssetServerError error, QSharedPointer<ReceivedMessage> message) {
if (!responseReceived) { if (!responseReceived) {
_error = NetworkError; _error = NetworkError;
@ -59,7 +51,6 @@ void GetMappingRequest::doStart() {
if (!_error) { if (!_error) {
_hash = message->read(SHA256_HASH_LENGTH).toHex(); _hash = message->read(SHA256_HASH_LENGTH).toHex();
assetClient->_mappingCache[_path] = _hash;
} }
emit finished(this); emit finished(this);
}); });
@ -88,12 +79,10 @@ void GetAllMappingsRequest::doStart() {
if (!error) { if (!error) {
int numberOfMappings; int numberOfMappings;
message->readPrimitive(&numberOfMappings); message->readPrimitive(&numberOfMappings);
assetClient->_mappingCache.clear();
for (auto i = 0; i < numberOfMappings; ++i) { for (auto i = 0; i < numberOfMappings; ++i) {
auto path = message->readString(); auto path = message->readString();
auto hash = message->readString(); auto hash = message->readString();
_mappings[path] = hash; _mappings[path] = hash;
assetClient->_mappingCache[path] = hash;
} }
} }
emit finished(this); emit finished(this);
@ -122,9 +111,6 @@ void SetMappingRequest::doStart() {
} }
} }
if (!error) {
assetClient->_mappingCache[_path] = _hash;
}
emit finished(this); emit finished(this);
}); });
}; };
@ -151,12 +137,6 @@ void DeleteMappingsRequest::doStart() {
} }
} }
if (!error) {
// enumerate the paths and remove them from the cache
for (auto& path : _paths) {
assetClient->_mappingCache.remove(path);
}
}
emit finished(this); emit finished(this);
}); });
}; };
@ -189,14 +169,6 @@ void RenameMappingRequest::doStart() {
} }
} }
if (!error) {
// take the hash mapped for the old path from the cache
auto hash = assetClient->_mappingCache.take(_oldPath);
if (!hash.isEmpty()) {
// use the hash mapped for the old path for the new path
assetClient->_mappingCache[_newPath] = hash;
}
}
emit finished(this); emit finished(this);
}); });
} }