From de36f3eeb2a9af5a0e8f61d404459b6d02046256 Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Mon, 18 Jan 2016 14:22:48 -0800 Subject: [PATCH] Update ServerPathUtils::getDataDirectory to use custom path lookup --- libraries/shared/src/ServerPathUtils.cpp | 31 ++++++++++++++++++++---- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/libraries/shared/src/ServerPathUtils.cpp b/libraries/shared/src/ServerPathUtils.cpp index d253265103..0f9ebabbbe 100644 --- a/libraries/shared/src/ServerPathUtils.cpp +++ b/libraries/shared/src/ServerPathUtils.cpp @@ -1,16 +1,37 @@ +// +// ServerPathUtils.cpp +// libraries/shared/src +// +// Created by Ryan Huffman on 01/12/16. +// Copyright 2016 High Fidelity, Inc. +// +// Distributed under the Apache License, Version 2.0. +// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html +// #include "ServerPathUtils.h" #include #include +#include +#include QString ServerPathUtils::getDataDirectory() { - auto directory = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation); - if (directory.isEmpty()) { - directory = '.'; - } - return directory; + auto homeDirectory = QDir(QStandardPaths::writableLocation(QStandardPaths::HomeLocation)); + +#ifdef Q_OS_WIN + homeDirectory.cd("AppData/Roaming/"); +#elif Q_OS_OSX + homeDirectory.cd("Library/Application Support/"); +#else + homeDirectory.cd(".local/share/"); +#endif + + homeDirectory.cd(qApp->organizationName() + "/" + qApp->applicationName()); + + return homeDirectory.absolutePath(); } QString ServerPathUtils::getDataFilePath(QString filename) { return QDir(getDataDirectory()).absoluteFilePath(filename); } +