From fc42254be117045ee3092aa87fb3dc9c32790b0c Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Thu, 14 Jan 2016 12:57:29 -0800 Subject: [PATCH] Add migration of old Asset server data --- assignment-client/src/assets/AssetServer.cpp | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/assignment-client/src/assets/AssetServer.cpp b/assignment-client/src/assets/AssetServer.cpp index 2f9e7ee1e6..e7a39deab4 100644 --- a/assignment-client/src/assets/AssetServer.cpp +++ b/assignment-client/src/assets/AssetServer.cpp @@ -24,6 +24,7 @@ #include "NodeType.h" #include "SendAssetTask.h" #include "UploadAssetTask.h" +#include const QString ASSET_SERVER_LOGGING_TARGET_NAME = "asset-server"; @@ -49,8 +50,19 @@ void AssetServer::run() { auto nodeList = DependencyManager::get(); nodeList->addNodeTypeToInterestSet(NodeType::Agent); - _resourcesDirectory = QDir(QCoreApplication::applicationDirPath()).filePath("resources/assets"); + const QString RESOURCES_PATH = "resources/assets"; + + _resourcesDirectory = QDir(ServerPathUtils::getDataDirectory()).filePath(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); + + if (QDir(oldResourcesDirectory).exists()) { + qDebug() << "Existing assets found in " << oldResourcesDirectory << ", copying to " << _resourcesDirectory; + QFile::copy(oldResourcesDirectory, _resourcesDirectory.absolutePath()); + } + qDebug() << "Creating resources directory"; _resourcesDirectory.mkpath("."); }