Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-28 05:18:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

bug fixes for rename/delete operations

Browse source
This commit is contained in:
Stephen Birarda 2016-03-09 13:28:05 -08:00
parent a65d06c7ce
commit 5e9751c6ed
1 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -532,7 +532,7 @@ bool AssetServer::deleteMappings(const AssetPathList& paths) {
auto sizeBefore = _fileMappings.size(); auto sizeBefore = _fileMappings.size();
while (it != _fileMappings.end()) { while (it != _fileMappings.end()) {
if (it->toString().startsWith(path)) { if (it.key().startsWith(path)) {
it = _fileMappings.erase(it); it = _fileMappings.erase(it);
} else { } else {
++it; ++it;
@ -573,6 +573,8 @@ bool AssetServer::renameMapping(const AssetPath& oldPath, const AssetPath& newPa
if (pathIsFolder(oldPath)) { if (pathIsFolder(oldPath)) {
if (!pathIsFolder(newPath)) { if (!pathIsFolder(newPath)) {
// we were asked to rename a path to a folder to a path that isn't a folder, this is a fail // we were asked to rename a path to a folder to a path that isn't a folder, this is a fail
qWarning() << "Cannot rename mapping from folder path" << oldPath << "to file path" << newPath;
return false; return false;
} }
@ -583,12 +585,12 @@ bool AssetServer::renameMapping(const AssetPath& oldPath, const AssetPath& newPa
auto it = oldMappings.begin(); auto it = oldMappings.begin();
while (it != oldMappings.end()) { while (it != oldMappings.end()) {
if (it->toString().startsWith(oldPath)) { if (it.key().startsWith(oldPath)) {
auto oldKey = it.key(); auto newKey = it.key();
auto newKey = oldKey.replace(0, oldPath.size(), newPath); newKey.replace(0, oldPath.size(), newPath);
// remove the old version from the in memory file mappings // remove the old version from the in memory file mappings
_fileMappings.remove(oldKey); _fileMappings.remove(it.key());
_fileMappings.insert(newKey, it.value()); _fileMappings.insert(newKey, it.value());
} }
@ -597,18 +599,25 @@ bool AssetServer::renameMapping(const AssetPath& oldPath, const AssetPath& newPa
if (writeMappingsToFile()) { if (writeMappingsToFile()) {
// persisted the changed mappings, return success // persisted the changed mappings, return success
qDebug() << "Renamed mapping:" << oldPath << "=>" << newPath; qDebug() << "Renamed folder mapping:" << oldPath << "=>" << newPath;
return true; return true;
} else { } else {
// couldn't persist the renamed paths, rollback and return failure // couldn't persist the renamed paths, rollback and return failure
_fileMappings = oldMappings; _fileMappings = oldMappings;
qWarning() << "Failed to persist renamed mapping:" << oldPath << "=>" << newPath; qWarning() << "Failed to persist renamed folder mapping:" << oldPath << "=>" << newPath;
return false; return false;
} }
} else { } else {
if (pathIsFolder(newPath)) {
// we were asked to rename a path to a file to a path that is a folder, this is a fail
qWarning() << "Cannot rename mapping from file path" << oldPath << "to folder path" << newPath;
return false;
}
// take the old hash to remove the old mapping // take the old hash to remove the old mapping
auto oldMapping = _fileMappings.take(oldPath).toString(); auto oldMapping = _fileMappings.take(oldPath).toString();