Use timer to not pick up changes in temporary tracks.

Author: daschuer

src/library/trackcollectionmanager.cpp

@@ -75,17 +75,17 @@ TrackCollectionManager::TrackCollectionManager(QObject* parent,
     } else {
         m_pScanner = std::make_unique<LibraryScanner>(pDbConnectionPool, pConfig);
 
+        connect(m_pScanner.get(),
+                &LibraryScanner::scanFinished,
+                this,
+                &TrackCollectionManager::slotScanFinished);
+
         // Forward signals
         connect(m_pScanner.get(),
                 &LibraryScanner::scanStarted,
                 this,
                 &TrackCollectionManager::libraryScanStarted,
                 /*signal-to-signal*/ Qt::DirectConnection);
-        connect(m_pScanner.get(),
-                &LibraryScanner::scanFinished,
-                this,
-                &TrackCollectionManager::libraryScanFinished,
-                /*signal-to-signal*/ Qt::DirectConnection);
         connect(m_pScanner.get(),
                 &LibraryScanner::scanSummary,
                 this,
@@ -644,21 +644,26 @@ bool TrackCollectionManager::updateTrackMood(
 }
 #endif // __EXTRA_METADATA__
 
-void TrackCollectionManager::slotIncomingDirectoryChanged(const QString& path) {
+void TrackCollectionManager::slotIncomingDirectoryChanged() {
     VERIFY_OR_DEBUG_ASSERT(m_pScanner) {
         return;
     }
 
-    if (path.isEmpty() || !m_pScanner->isIdle()) {
+    QStringList dirs = m_incommingDirWatcher.directories();
+    if (dirs.isEmpty()) {
+        return;
+    }
+    if (!m_pScanner->isIdle()) {
+        m_incommingDirChangePending = true;
         return;
     }
 
-    auto fi = QFileInfo(path);
+    auto fi = QFileInfo(dirs.first());
     const QString absPath = fi.absoluteFilePath();
 
     kLogger.info() << "Incoming directory changed, starting scan for:" << absPath;
 
-    m_pScanner->scanDir(path);
+    m_pScanner->scanDir(absPath);
 }
 
 void TrackCollectionManager::initIncommingDirWatcher(const QString& incommingTracksDir) {
@@ -680,10 +685,17 @@ void TrackCollectionManager::initIncommingDirWatcher(const QString& incommingTra
                           << incomingDirPath;
     } else {
         kLogger.info() << "Watching incoming tracks directory" << incomingDirPath;
+        m_incommingDirTimer.setSingleShot(true);
+        connect(&m_incommingDirTimer,
+                &QTimer::timeout,
+                this,
+                &TrackCollectionManager::slotIncomingDirectoryChanged);
         connect(&m_incommingDirWatcher,
                 &QFileSystemWatcher::directoryChanged,
                 this,
-                &TrackCollectionManager::slotIncomingDirectoryChanged);
+                [this]() {
+                    m_incommingDirTimer.start(2000);
+                });
     }
 }
 

src/library/trackcollectionmanager.h

@@ -4,6 +4,7 @@
 #include <QFileSystemWatcher>
 #include <QList>
 #include <QSet>
+#include <QTimer>
 #include <memory>
 
 #include "library/dao/directorydao.h"
@@ -107,7 +108,7 @@ class TrackCollectionManager: public QObject,
   public slots:
     void startLibraryScan();
     void stopLibraryScan();
-    void slotIncomingDirectoryChanged(const QString& path);
+    void slotIncomingDirectoryChanged();
     void slotScanFinished();
 
   private:
@@ -142,5 +143,6 @@ class TrackCollectionManager: public QObject,
     std::unique_ptr<LibraryScanner> m_pScanner;
 
     QFileSystemWatcher m_incommingDirWatcher;
+    QTimer m_incommingDirTimer;
     bool m_incommingDirChangePending;
 };