yesBad/proton-bridge
1
0
Fork 0
forked from Silverfish/proton-bridge
Code Actions Activity

Other: set gui logs with other logs in user data directory.

Browse Source
This commit is contained in:
Romain LE JEUNE
2022-11-18 18:45:45 +01:00
parent 204e320df4
commit aaa8a35ea8
1 changed files with 28 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
internal/frontend/bridge-gui/bridgepp/bridgepp/BridgeUtils.cpp
View File

@ -100,7 +100,7 @@ QString userConfigDir()
//**************************************************************************************************************************************************** //****************************************************************************************************************************************************
/// \return user configuration directory used by bridge (based on Golang OS/File's UserCacheDir). /// \return user cache directory used by bridge (based on Golang OS/File's UserCacheDir).
//**************************************************************************************************************************************************** //****************************************************************************************************************************************************
QString userCacheDir() QString userCacheDir()
{ {
@ -121,7 +121,7 @@ QString userCacheDir()
{ {
dir = qgetenv ("HOME"); dir = qgetenv ("HOME");
if (dir.isEmpty()) if (dir.isEmpty())
throw Exception("neither XDG_CACHE_HOME nor $HOME are defined"); throw Exception("neither $XDG_CACHE_HOME nor $HOME are defined");
dir += "/.cache"; dir += "/.cache";
} }
#endif #endif
@ -132,13 +132,38 @@ QString userCacheDir()
return folder; return folder;
} }
//****************************************************************************************************************************************************
/// \return user data directory used by bridge (based on Golang OS/File's UserDataDir).
//****************************************************************************************************************************************************
QString userDataDir()
{
QString dir;
#ifdef Q_OS_LINUX
dir = qgetenv ("XDG_DATA_HOME");
if (dir.isEmpty())
{
dir = qgetenv ("HOME");
if (dir.isEmpty())
throw Exception("neither $XDG_DATA_HOME nor $HOME are defined");
dir += "/.local/share";
}
#else
dir = userCacheDir()
#endif
QString const folder = QDir(dir).absoluteFilePath(configFolder);
QDir().mkpath(folder);
return folder;
}
//**************************************************************************************************************************************************** //****************************************************************************************************************************************************
/// \return user logs directory used by bridge. /// \return user logs directory used by bridge.
//**************************************************************************************************************************************************** //****************************************************************************************************************************************************
QString userLogsDir() QString userLogsDir()
{ {
QString const path = QDir(userCacheDir()).absoluteFilePath("logs"); QString const path = QDir(userDataDir()).absoluteFilePath("logs");
QDir().mkpath(path); QDir().mkpath(path);
return path; return path;
} }