fix: Enhance file monitoring capabilities

Kakueeen · Kakueeen · commit a2cf9666dd17 · 2025-08-13T11:35:34.000+08:00
- Added functionality to monitor newly created directories and handle pending directories. - Implemented parent directory monitoring for non-existing paths. - Improved logging for directory changes and monitoring status. Log: Enhance file monitoring capabilities Bug: https://pms.uniontech.com/bug-view-327673.html
diff --git a/src/src/fileMonitor/fileinotify.cpp b/src/src/fileMonitor/fileinotify.cpp
@@ -26,7 +26,7 @@ FileInotify::FileInotify(QObject *parent)
     , m_Supported(LibUnionImage_NameSpace::unionImageSupportFormat() + LibUnionImage_NameSpace::videoFiletypes()) //图片+视频
 {
     qDebug() << "Initializing FileInotify with supported formats:" << m_Supported;
-    
+
     for (auto &eachData : m_Supported) {
         eachData = eachData.toUpper();
     }
@@ -35,8 +35,12 @@ FileInotify::FileInotify(QObject *parent)
     connect(m_timer, &QTimer::timeout, this, &FileInotify::onNeedSendPictures);
 
     connect(&m_watcher, &QFileSystemWatcher::directoryChanged, this, [this](const QString & path) {
-        Q_UNUSED(path)
-        qDebug() << "Directory change detected, starting timer";
+        qDebug() << "Directory change detected in:" << path;
+
+        // 检查是否有待创建的目录已经被创建
+        checkPendingDirectories(path);
+
+        // 启动定时器处理其他变化
         m_timer->start(500);
     });
 }
@@ -50,6 +54,8 @@ FileInotify::~FileInotify()
 void FileInotify::checkNewPath()
 {
     qDebug() << "Checking for new paths in monitored directories";
+
+    // 检查现有监控目录的子目录
     for (const auto &currentDir : m_currentDirs) {
         QDir dir(currentDir);
         QFileInfoList list;
@@ -61,19 +67,72 @@ void FileInotify::checkNewPath()
         });
 
         if (!dirs.isEmpty()) {
-            qDebug() << "Adding new directories to watch:" << dirs;
+            qDebug() << "Adding new subdirectories to watch:" << dirs;
             m_watcher.addPaths(dirs);
         }
     }
+
+    // 检查待创建目录是否已经存在
+    QStringList newlyCreatedDirs;
+    for (const QString &pendingDir : m_pendingDirs) {
+        QFileInfo pendingInfo(pendingDir);
+        if (pendingInfo.exists() && pendingInfo.isDir()) {
+            newlyCreatedDirs.append(pendingDir);
+            qInfo() << "Pending directory now exists:" << pendingDir;
+        }
+    }
+
+    // 为新创建的目录设置直接监听
+    for (const QString &newDir : newlyCreatedDirs) {
+        checkPendingDirectories(QFileInfo(newDir).absolutePath());
+    }
 }
 
 void FileInotify::addWather(const QStringList &paths, const QString &album, int UID)
 {
     qDebug() << "Adding watch for paths:" << paths << "Album:" << album << "UID:" << UID;
-    m_currentDirs = paths;
+
     m_currentAlbum = album;
     m_currentUID = UID;
-    m_watcher.addPaths(paths);
+
+    // 分类路径：存在的和不存在的
+    QStringList existingPaths;
+    QStringList nonExistingPaths;
+
+    for (const QString &path : paths) {
+        QFileInfo info(path);
+        if (info.exists() && info.isDir()) {
+            existingPaths.append(path);
+        } else {
+            nonExistingPaths.append(path);
+            qDebug() << "Path does not exist, will try parent monitoring:" << path;
+        }
+    }
+
+    // 设置当前监控的直接路径
+    m_currentDirs = existingPaths;
+
+    // 为存在的路径添加直接监听
+    if (!existingPaths.isEmpty()) {
+        m_watcher.addPaths(existingPaths);
+        qDebug() << "Added direct monitoring for existing paths:" << existingPaths;
+    }
+
+    // 为不存在的路径设置父级监听
+    for (const QString &path : nonExistingPaths) {
+        QFileInfo pathInfo(path);
+        QString parentPath = pathInfo.absolutePath();
+        QFileInfo parentInfo(parentPath);
+
+        if (parentInfo.exists() && parentInfo.isDir()) {
+            addParentWatcher(parentPath, path);
+            m_pendingDirs.append(path);
+            qDebug() << "Added parent monitoring for non-existing path:" << path << "parent:" << parentPath;
+        } else {
+            qWarning() << "Cannot monitor path, parent directory does not exist:" << path << "parent:" << parentPath;
+        }
+    }
+
     m_timer->start(1500);
 }
 
@@ -94,8 +153,13 @@ void FileInotify::clear()
     qDebug() << "Clearing FileInotify state";
     m_Supported.clear();
     m_newFile.clear();
-    m_Supported.clear();
-    if (m_timer->isActive()) {
+    m_deleteFile.clear();
+    m_currentDirs.clear();
+    m_pendingDirs.clear();
+    m_parentDirs.clear();
+    m_parentToChildren.clear();
+
+    if (m_timer && m_timer->isActive()) {
         m_timer->stop();
         delete m_timer;
         m_timer = nullptr;
@@ -195,7 +259,7 @@ void FileInotify::onNeedSendPictures()
 
     //发送导入
     if (!m_newFile.isEmpty() || !m_deleteFile.isEmpty()) {
-        qInfo() << "Emitting monitor changed signal - New files:" << m_newFile.size() 
+        qInfo() << "Emitting monitor changed signal - New files:" << m_newFile.size()
                 << "Deleted files:" << m_deleteFile.size();
         emit sigMonitorChanged(m_newFile, m_deleteFile, m_currentAlbum, m_currentUID);
 
@@ -216,3 +280,72 @@ void FileInotify::onNeedSendPictures()
 
     m_timer->stop();
 }
+
+void FileInotify::addParentWatcher(const QString &parentPath, const QString &targetChild)
+{
+    qDebug() << "Adding parent watcher for:" << parentPath << "target child:" << targetChild;
+
+    // 检查是否已经监听了这个父级目录
+    if (!m_parentDirs.contains(parentPath)) {
+        m_parentDirs.append(parentPath);
+        m_watcher.addPath(parentPath);
+        qDebug() << "Started monitoring parent directory:" << parentPath;
+    }
+
+    // 建立父级目录到子目录的映射
+    if (!m_parentToChildren.contains(parentPath)) {
+        m_parentToChildren[parentPath] = QStringList();
+    }
+
+    if (!m_parentToChildren[parentPath].contains(targetChild)) {
+        m_parentToChildren[parentPath].append(targetChild);
+        qDebug() << "Added target child mapping:" << parentPath << "->" << targetChild;
+    }
+}
+
+void FileInotify::checkPendingDirectories(const QString &changedPath)
+{
+    qDebug() << "Checking pending directories for changed path:" << changedPath;
+
+    // 检查是否有待创建的目录位于变化的路径下
+    QStringList foundDirs;
+    for (const QString &pendingDir : m_pendingDirs) {
+        QFileInfo pendingInfo(pendingDir);
+
+        // 如果待创建目录的父级路径就是变化的路径，并且现在已经存在
+        if (pendingInfo.absolutePath() == changedPath && pendingInfo.exists() && pendingInfo.isDir()) {
+            foundDirs.append(pendingDir);
+            qInfo() << "Found newly created target directory:" << pendingDir;
+        }
+    }
+
+    // 为新创建的目录添加直接监听
+    for (const QString &foundDir : foundDirs) {
+        // 从待创建列表中移除
+        m_pendingDirs.removeAll(foundDir);
+
+        // 添加到当前监控目录列表
+        m_currentDirs.append(foundDir);
+
+        // 添加直接监听
+        m_watcher.addPath(foundDir);
+        qInfo() << "Added direct monitoring for newly created directory:" << foundDir;
+
+        // 检查是否可以移除父级监听
+        QString parentPath = QFileInfo(foundDir).absolutePath();
+        if (m_parentToChildren.contains(parentPath)) {
+            m_parentToChildren[parentPath].removeAll(foundDir);
+
+            // 如果这个父级目录不再需要监听其他子目录，移除父级监听
+            if (m_parentToChildren[parentPath].isEmpty()) {
+                m_parentToChildren.remove(parentPath);
+                m_parentDirs.removeAll(parentPath);
+                m_watcher.removePath(parentPath);
+                qDebug() << "Removed parent monitoring for:" << parentPath;
+            }
+        }
+
+        // 触发新路径检查以监听该目录下的子目录
+        m_timer->start(500);
+    }
+}
diff --git a/src/src/fileMonitor/fileinotify.h b/src/src/fileMonitor/fileinotify.h
@@ -41,11 +41,18 @@ public slots:
 private:
     //检查是否新建了子文件夹
     void checkNewPath();
+    //检查待创建的目录是否已经创建
+    void checkPendingDirectories(const QString &changedPath);
+    //添加父级目录监听
+    void addParentWatcher(const QString &parentPath, const QString &targetChild);
 
     bool m_running = false;
     QStringList m_newFile;      //当前新添加的
     QStringList m_deleteFile;   //当前删除的
     QStringList m_currentDirs;  //给定的当前监控路径
+    QStringList m_pendingDirs;  //等待创建的目标目录
+    QStringList m_parentDirs;   //当前监听的父级目录
+    QMap<QString, QStringList> m_parentToChildren; //父级目录到子目录的映射
     QString m_currentAlbum;     //给定当前的相册
     int m_currentUID;           //给定当前的相册的UID
     QStringList  m_Supported;   //支持的格式
diff --git a/src/src/fileMonitor/fileinotifygroup.cpp b/src/src/fileMonitor/fileinotifygroup.cpp
@@ -18,25 +18,9 @@ FileInotifyGroup::FileInotifyGroup(QObject *parent) : QObject(parent)
 void FileInotifyGroup::startWatch(const QStringList &paths, const QString &album, int UID)
 {
     qDebug() << "Starting watch for album:" << album << "UID:" << UID << "with paths:" << paths;
-    
-    //去除不存在的路径
-    QStringList watchPaths;
-    for (const auto &path : paths) {
-        QFileInfo info(path);
-        if (info.exists() && info.isDir()) {
-            watchPaths.push_back(path);
-        } else {
-            qWarning() << "Path does not exist or is not a directory, skipping:" << path;
-        }
-    }
-    if (watchPaths.isEmpty()) {
-        qWarning() << "No valid paths to watch for album:" << album << "UID:" << UID;
-        return;
-    }
-
     //启动监控
     auto watcher = new FileInotify;
-    watcher->addWather(watchPaths, album, UID);
+    watcher->addWather(paths, album, UID);
 
     //原cpp为signal发送的全局信号,现在改为传递的方法,发送回albumControl
     connect(watcher, &FileInotify::sigMonitorChanged, this, &FileInotifyGroup::sigMonitorChanged);
