From c417bc0fb3680c400286be06e1d508580a47f261 Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Tue, 19 Jan 2016 14:35:06 -0800 Subject: [PATCH] Move asset resource directory out of /resources --- assignment-client/src/assets/AssetServer.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/assignment-client/src/assets/AssetServer.cpp b/assignment-client/src/assets/AssetServer.cpp index e7a39deab4..b572f14ba6 100644 --- a/assignment-client/src/assets/AssetServer.cpp +++ b/assignment-client/src/assets/AssetServer.cpp @@ -50,13 +50,14 @@ void AssetServer::run() { auto nodeList = DependencyManager::get(); nodeList->addNodeTypeToInterestSet(NodeType::Agent); - const QString RESOURCES_PATH = "resources/assets"; + const QString OLD_RESOURCES_PATH = "resources/assets"; + const QString RESOURCES_PATH = "assets"; - _resourcesDirectory = QDir(ServerPathUtils::getDataDirectory()).filePath(RESOURCES_PATH); + _resourcesDirectory = QDir(ServerPathUtils::getDataFilePath(RESOURCES_PATH)); if (!_resourcesDirectory.exists()) { qDebug() << "Asset resources directory not found, searching for existing asset resources"; QString oldDataDirectory = QCoreApplication::applicationDirPath(); - auto oldResourcesDirectory = QDir(oldDataDirectory).filePath(RESOURCES_PATH); + auto oldResourcesDirectory = QDir(oldDataDirectory).filePath(OLD_RESOURCES_PATH); if (QDir(oldResourcesDirectory).exists()) { qDebug() << "Existing assets found in " << oldResourcesDirectory << ", copying to " << _resourcesDirectory;