From 822244ef725cbc246eaba4e2cdc213d737efda57 Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Thu, 21 Jan 2016 16:43:08 -0800 Subject: [PATCH] Fix DS new assignment feature --- domain-server/src/DomainServer.cpp | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp index 19950c9e0b..8d9a28513d 100644 --- a/domain-server/src/DomainServer.cpp +++ b/domain-server/src/DomainServer.cpp @@ -1148,13 +1148,22 @@ QJsonObject DomainServer::jsonObjectForNode(const SharedNodePointer& node) { return nodeJson; } -const char ASSIGNMENT_SCRIPT_HOST_LOCATION[] = "resources/web/assignment"; +QDir pathForAssignmentScriptsDirectory() { + static const QString SCRIPTS_DIRECTORY_NAME = "/scripts/"; + + QDir directory(ServerPathUtils::getDataDirectory() + SCRIPTS_DIRECTORY_NAME); + if (!directory.exists()) { + directory.mkpath("."); + qInfo() << "Created path to " << directory.path(); + } + + return directory; +} + QString pathForAssignmentScript(const QUuid& assignmentUUID) { - QString newPath { ServerPathUtils::getDataDirectory() + "/" + QString(ASSIGNMENT_SCRIPT_HOST_LOCATION) }; - newPath += "/scripts/"; + QDir directory = pathForAssignmentScriptsDirectory(); // append the UUID for this script as the new filename, remove the curly braces - newPath += uuidStringWithoutCurlyBraces(assignmentUUID); - return newPath; + return directory.absoluteFilePath(uuidStringWithoutCurlyBraces(assignmentUUID)); } const QString URI_OAUTH = "/oauth";