Martchus
/
syncthingtray
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update lookup of Syncthing config dir for Unix platforms 

* Adapt to Syncthing commit b5082f6af8b0a70afd3bc42977dad26920e72b68
* See https://github.com/Martchus/syncthingtray/issues/216
  and https://github.com/syncthing/syncthing/issues/9178
This commit is contained in:
Martchus 2023-12-10 12:39:53 +01:00
parent 9665a18b4f
commit efa6775369
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
syncthingconnector/syncthingconfig.cpp
View File

@ -25,6 +25,7 @@ namespace Data {
*/
QString SyncthingConfig::locateConfigFile(const QString &fileName)
{
// check override via environment variable
auto path = qEnvironmentVariable(PROJECT_VARNAME_UPPER "_SYNCTHING_CONFIG_DIR");
if (!path.isEmpty()) {
if (!QFile::exists(path = path % QChar('/') % fileName)) {
@ -32,6 +33,8 @@ QString SyncthingConfig::locateConfigFile(const QString &fileName)
}
return path;
}
// check usual standard locations
static const QString casings[] = { QStringLiteral("syncthing/"), QStringLiteral("Syncthing/") };
static const QStandardPaths::StandardLocation locations[] = { QStandardPaths::GenericConfigLocation, QStandardPaths::RuntimeLocation };
for (const auto location : locations) {
@ -41,6 +44,22 @@ QString SyncthingConfig::locateConfigFile(const QString &fileName)
}
}
}
// check state dir used by Syncthing on Unix systems as of v1.27.0 (commit b5082f6af8b0a70afd3bc42977dad26920e72b68)
#if defined(Q_OS_UNIX) && !defined(Q_OS_DARWIN)
if (!(path = qEnvironmentVariable("XDG_STATE_HOME")).isEmpty()) {
if (QFile::exists(path = path % QStringLiteral("/syncthing/") % fileName)) {
return path;
}
}
if (!(path = QStandardPaths::writableLocation(QStandardPaths::HomeLocation)).isEmpty()) {
if (QFile::exists(path = path % QStringLiteral("/.local/state/syncthing/") % fileName)) {
return path;
}
}
#endif
path.clear();
return path;
}