Do polling based file watching for NFS on linux, resolves #1799

keepassxreboot · Aug 3, 2018 · c9208ee · c9208ee
1 parent 07efabe
commit c9208ee
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/src/gui/DatabaseWidget.cpp b/src/gui/DatabaseWidget.cpp
@@ -1215,6 +1215,21 @@ void DatabaseWidget::updateFilePath(const QString& filePath)
         m_fileWatcher.removePath(m_filePath);
     }
 
+#if defined(Q_OS_LINUX)
+    struct statfs statfsBuf;
+    bool forcePolling = false;
+    const auto NFS_SUPER_MAGIC = 0x6969;
+
+    if (!statfs(filePath.toLocal8Bit().constData(), &statfsBuf)) {
+        forcePolling = (statfsBuf.f_type == NFS_SUPER_MAGIC);
+    } else {
+        // if we can't get the fs type let's fall back to polling
+        forcePolling = true;
+    }
+    auto objectName = forcePolling ? QLatin1String("_qt_autotest_force_engine_poller") : QLatin1String("");
+    m_fileWatcher.setObjectName(objectName);
+#endif
+
     m_fileWatcher.addPath(filePath);
     m_filePath = filePath;
 }

diff --git a/src/gui/DatabaseWidget.h b/src/gui/DatabaseWidget.h
@@ -24,6 +24,10 @@
 #include <QStackedWidget>
 #include <QTimer>
 
+#ifdef Q_OS_LINUX
+#include <sys/vfs.h>
+#endif
+
 #include "gui/entry/EntryModel.h"
 #include "gui/MessageWidget.h"
 #include "gui/csvImport/CsvImportWizard.h"