improve filesystemwatcher

jsmolka · Oct 6, 2018 · e6831be · e6831be
1 parent 50358ad
commit e6831be
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 1 deletion.
diff --git a/src/core/filesystem/filesystemwatcher.cpp b/src/core/filesystem/filesystemwatcher.cpp
@@ -1,12 +1,14 @@
 #include "filesystemwatcher.hpp"
 
+#include <QDirIterator>
 #include <QFileInfo>
 
 FileSystemWatcher::FileSystemWatcher(QObject *parent)
     : QObject(parent)
     , m_watcher(this)
     , m_timer(this)
     , m_ignoreDir(false)
+    , m_lastSize(0)
 {
     connect(&m_watcher, &QFileSystemWatcher::fileChanged, this, &FileSystemWatcher::onFileChanged);
     connect(&m_watcher, &QFileSystemWatcher::directoryChanged, this, &FileSystemWatcher::onDirectoryChanged);
@@ -55,9 +57,30 @@ void FileSystemWatcher::onDirectoryChanged(const Path &dir)
 
 void FileSystemWatcher::onTimerTimeout()
 {
+    const qint64 size = dirSize(m_bufferedDir);
+    if (size != m_lastSize)
+    {
+        m_lastSize = size;
+        m_timer.start(s_bufferDuration);
+        return;
+    }
+
     if (!m_ignoreDir)
         emit directoryChanged(m_bufferedDir);
 
     m_bufferedDir = Path();
     m_ignoreDir = false;
+    m_lastSize = 0;
+}
+
+qint64 FileSystemWatcher::dirSize(const Path &dir)
+{
+    qint64 size = 0;
+    QDirIterator dirIter(dir, QDir::Files, QDirIterator::Subdirectories);
+    while (dirIter.hasNext())
+    {
+        dirIter.next();
+        size += dirIter.fileInfo().size();
+    }
+    return size;
 }
diff --git a/src/core/filesystem/filesystemwatcher.hpp b/src/core/filesystem/filesystemwatcher.hpp
@@ -29,12 +29,15 @@ private slots:
     void onTimerTimeout();
 
 private:
-    static constexpr int s_bufferDuration{1000};
+    static qint64 dirSize(const Path &dir);
+
+    static constexpr int s_bufferDuration{500};
 
     QFileSystemWatcher m_watcher;
     QTimer m_timer;
     Path m_bufferedDir;
     bool m_ignoreDir;
+    qint64 m_lastSize;
 };
 
 #endif // FILESYSTEMWATCHER_HPP