|
|
|
@ -1784,7 +1784,9 @@ std::string CPath::getApplicationDirectory(const std::string &appName, bool loca
|
|
|
|
|
std::string CFileContainer::getApplicationDirectory(const std::string &appName, bool local)
|
|
|
|
|
{
|
|
|
|
|
static std::string appPaths[2];
|
|
|
|
|
|
|
|
|
|
std::string &appPath = appPaths[local ? 1 : 0];
|
|
|
|
|
|
|
|
|
|
if (appPath.empty())
|
|
|
|
|
{
|
|
|
|
|
#ifdef NL_OS_WINDOWS
|
|
|
|
@ -1800,26 +1802,21 @@ std::string CFileContainer::getApplicationDirectory(const std::string &appName,
|
|
|
|
|
SHGetSpecialFolderPathW(NULL, buffer, CSIDL_APPDATA, TRUE);
|
|
|
|
|
}
|
|
|
|
|
appPath = CPath::standardizePath(wideToUtf8(buffer));
|
|
|
|
|
#elif defined(NL_OS_MAC)
|
|
|
|
|
appPath = CPath::standardizePath(getenv("HOME"));
|
|
|
|
|
appPath += "/Library/Application Support/";
|
|
|
|
|
#else
|
|
|
|
|
appPath = CPath::standardizePath(getenv("HOME"));
|
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
// get user home directory from HOME environment variable
|
|
|
|
|
const char* homePath = getenv("HOME");
|
|
|
|
|
appPath = CPath::standardizePath(homePath ? homePath : ".");
|
|
|
|
|
|
|
|
|
|
std::string path = appPath;
|
|
|
|
|
#ifdef NL_OS_WINDOWS
|
|
|
|
|
if (!appName.empty())
|
|
|
|
|
path = CPath::standardizePath(path + appName);
|
|
|
|
|
#elif defined(NL_OS_MAC)
|
|
|
|
|
path = CPath::standardizePath(path + appName);
|
|
|
|
|
#if defined(NL_OS_MAC)
|
|
|
|
|
appPath += "Library/Application Support/";
|
|
|
|
|
#else
|
|
|
|
|
if (!appName.empty())
|
|
|
|
|
path = CPath::standardizePath(path + "." + toLower(appName));
|
|
|
|
|
// recommended for applications data that are owned by user
|
|
|
|
|
appPath += ".local/share/";
|
|
|
|
|
#endif
|
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return path;
|
|
|
|
|
return CPath::standardizePath(appPath + appName);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
std::string CPath::getTemporaryDirectory()
|
|
|
|
|