Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Change conf path XDG_CACHE_HOME to XDG_STATE_HOME #9755

Merged
merged 10 commits into from
Oct 23, 2023
+33 −2
Merged

Change conf path XDG_CACHE_HOME to XDG_STATE_HOME #9755

Changes from 3 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
31c7159
Change conf path XDG_CACHE_HOME to XDG_STATE_HOME
jNullj Aug 18, 2023
134c56d
update docs for switch to XDG_STATE_HOME
jNullj Aug 18, 2023
b8bcf23
fix format
jNullj Aug 18, 2023
c5ca0bb
Migrate old conf file to new location on linux
jNullj Aug 18, 2023
2eecf98
remove unnecessary condition
jNullj Aug 25, 2023
0cd5ce4
Improve code readability
jNullj Aug 25, 2023
d77ef9d
Improve performance
jNullj Aug 25, 2023
85a2b74
Improve code readability
jNullj Aug 26, 2023
74c0f3d
Merge branch 'develop' into feat/switch-to-XDG_STATE_HOME-9738
jNullj Aug 26, 2023
bb9700d
Merge branch 'develop' into feat/switch-to-XDG_STATE_HOME-9738
jNullj Oct 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 14 additions & 13 deletions src/core/Config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,19 +476,21 @@ void Config::init(const QString& configFileName, const QString& localConfigFileN
// Upgrade from previous KeePassXC version which stores its config
// in ~/.cache on Linux instead of ~/.local/state.
// Move file to correct location before continuing.
QString oldLocalConfigPath;
oldLocalConfigPath = QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation) + "/keepassxc";
QString suffix;
if (!QFile::exists(localConfigFileName)) {
QString oldLocalConfigPath;
oldLocalConfigPath = QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation) + "/keepassxc";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You should not separate declaration/definition and assignment. Rest looks good.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed in 85a2b74

QString suffix;
#ifdef QT_DEBUG
suffix = "_debug";
suffix = "_debug";
#endif
oldLocalConfigPath += QString("/keepassxc%1.ini").arg(suffix);
oldLocalConfigPath = QDir::toNativeSeparators(oldLocalConfigPath);
if (!localConfigFileName.isEmpty() && !QFile::exists(localConfigFileName) && QFile::exists(oldLocalConfigPath)) {
QDir().mkpath(QFileInfo(localConfigFileName).absolutePath());
QFile::copy(oldLocalConfigPath, localConfigFileName);
QFile::remove(oldLocalConfigPath);
QDir().rmdir(QFileInfo(oldLocalConfigPath).absolutePath());
oldLocalConfigPath += QString("/keepassxc%1.ini").arg(suffix);
oldLocalConfigPath = QDir::toNativeSeparators(oldLocalConfigPath);
if (QFile::exists(oldLocalConfigPath)) {
QDir().mkpath(QFileInfo(localConfigFileName).absolutePath());
QFile::copy(oldLocalConfigPath, localConfigFileName);
QFile::remove(oldLocalConfigPath);
QDir().rmdir(QFileInfo(oldLocalConfigPath).absolutePath());
}
}
#endif

Expand Down Expand Up @@ -533,8 +535,7 @@ QPair<QString, QString> Config::defaultConfigFiles()
// On case-sensitive Operating Systems, force use of lowercase app directories
configPath = QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation) + "/keepassxc";
// Qt does not support XDG_STATE_HOME yet, change this once XDG_STATE_HOME is added
QString xdgStateHome;
xdgStateHome = QFile::decodeName(qgetenv("XDG_STATE_HOME"));
QString xdgStateHome = QFile::decodeName(qgetenv("XDG_STATE_HOME"));
if (!xdgStateHome.startsWith(u'/')) {
xdgStateHome.clear(); // spec says relative paths should be ignored
}
Expand Down