nosignal/nosignal-shell
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix: retry reading file before warn

Browse source 
Some programs will not write to the file atomically, causing us to read
a malformed JSON while the write is in progress. Add a retry system to
avoid false warnings.
This commit is contained in:
2 * r + 2 * t 2026-04-11 19:16:44 +10:00
parent a53aff357a
commit edf6184c81
2 changed files with 23 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
plugin/src/Caelestia/Config/configobject.cpp
View file

@ -285,6 +285,11 @@ void ConfigObject::setupFileBackend(const QString& path) {
m_watcher = new QFileSystemWatcher(this);
m_saveTimer = new QTimer(this);
m_cooldownTimer = new QTimer(this);
m_retryTimer = new QTimer(this);
m_retryTimer->setSingleShot(true);
m_retryTimer->setInterval(50);
connect(m_retryTimer, &QTimer::timeout, this, &ConfigObject::reloadFromFile);
m_saveTimer->setSingleShot(true);
m_saveTimer->setInterval(500);
@ -337,10 +342,20 @@ void ConfigObject::reloadFromFile() {
auto doc = QJsonDocument::fromJson(file.readAll(), &error);
if (error.error != QJsonParseError::NoError) {
qCWarning(lcConfig) << "Failed to parse" << m_filePath << ":" << error.errorString();
if (m_retryTimer && m_parseRetries < 3) {
m_parseRetries++;
qCDebug(lcConfig, "Failed to parse %s: %s - retrying (%d/3)", qPrintable(m_filePath),
qPrintable(error.errorString()), m_parseRetries);
m_retryTimer->start();
} else {
qCWarning(lcConfig, "Failed to parse %s: %s", qPrintable(m_filePath), qPrintable(error.errorString()));
m_parseRetries = 0;
}
return;
}
m_parseRetries = 0;
qCDebug(lcConfig) << "Reloading" << metaObject()->className() << "from" << m_filePath;
clearLoadedKeys();
@ -357,8 +372,12 @@ void ConfigObject::onFileChanged() {
if (!m_watcher->files().contains(m_filePath))
m_watcher->addPath(m_filePath);
if (!m_recentlySaved)
if (!m_recentlySaved) {
m_parseRetries = 0;
if (m_retryTimer)
m_retryTimer->stop();
reloadFromFile();
}
}
} // namespace caelestia::config

2
plugin/src/Caelestia/Config/configobject.hpp
View file

@ -105,6 +105,8 @@ private:
QFileSystemWatcher* m_watcher = nullptr;
QTimer* m_saveTimer = nullptr;
QTimer* m_cooldownTimer = nullptr;
QTimer* m_retryTimer = nullptr;
int m_parseRetries = 0;
// Per-monitor overlay state
ConfigObject* m_global = nullptr;