openkylin
/
ukui-search
mirror of https://gitee.com/openkylin/ukui-search.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge branch 'ukss-dev' into 'ukss-dev' 

增加非递归监听模式。

See merge request kylin-desktop/ukui-search!357
This commit is contained in:
纪笑旭 2022-08-05 07:52:28 +00:00
parent ee5d5ae413 8462a8cbcf
commit a765943b1a
3 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libsearch/filesystemwatcher/file-system-watcher-private.h
View File

@ -42,6 +42,8 @@ public:
QStringList removeWatch(const QString &path); QStringList removeWatch(const QString &path);
QString removeWatch(int wd); QString removeWatch(int wd);
private: private:
void init(); void init();
void traverse(QStringList pathList); void traverse(QStringList pathList);
@ -57,6 +59,8 @@ private:
QThreadPool *m_pool = nullptr; QThreadPool *m_pool = nullptr;
FileSystemWatcher *q = nullptr; FileSystemWatcher *q = nullptr;
bool m_recursive = true;
}; };

14
libsearch/filesystemwatcher/file-system-watcher.cpp
View File

@ -61,6 +61,9 @@ void FileSystemWatcherPrivate::traverse(QStringList pathList)
addWatch(path); addWatch(path);
queue.enqueue(path); queue.enqueue(path);
} }
if(!m_recursive) {
return;
}
QFileInfoList list; QFileInfoList list;
QDir dir; QDir dir;
dir.setFilter(QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot); dir.setFilter(QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot);
@ -146,12 +149,13 @@ void FileSystemWatcherPrivate::init()
} }
} }
FileSystemWatcher::FileSystemWatcher(WatchEvents events, WatchFlags flags, QObject *parent) FileSystemWatcher::FileSystemWatcher(bool recursive, WatchEvents events, WatchFlags flags, QObject *parent)
: QObject(parent) : QObject(parent)
, d(new FileSystemWatcherPrivate(this)) , d(new FileSystemWatcherPrivate(this))
{ {
d->m_watchEvents = events; d->m_watchEvents = events;
d->m_watchFlags = flags; d->m_watchFlags = flags;
d->m_recursive = recursive;
} }
FileSystemWatcher::~FileSystemWatcher() FileSystemWatcher::~FileSystemWatcher()
@ -220,7 +224,7 @@ void FileSystemWatcher::eventProcess(int socket)
if(event->mask & EventCreate) { if(event->mask & EventCreate) {
qDebug() << path << "--EventCreate"; qDebug() << path << "--EventCreate";
Q_EMIT created(path, event->mask & IN_ISDIR); Q_EMIT created(path, event->mask & IN_ISDIR);
if(event->mask & IN_ISDIR) { if(event->mask & IN_ISDIR && d->m_recursive) {
if(!QFileInfo(path).isSymLink()){ if(!QFileInfo(path).isSymLink()){
addWatch(QStringList(path)); addWatch(QStringList(path));
} }
@ -256,8 +260,10 @@ void FileSystemWatcher::eventProcess(int socket)
if (event->mask & EventMoveTo) { if (event->mask & EventMoveTo) {
qDebug() << path << "--EventMoveTo"; qDebug() << path << "--EventMoveTo";
Q_EMIT created(path, event->mask & IN_ISDIR); Q_EMIT created(path, event->mask & IN_ISDIR);
if (event->mask & IN_ISDIR) { if (event->mask & IN_ISDIR && d->m_recursive) {
addWatch(QStringList(path)); if(!QFileInfo(path).isSymLink()){
addWatch(QStringList(path));
}
} }
} }
if (event->mask & EventOpen) { if (event->mask & EventOpen) {

6
libsearch/filesystemwatcher/file-system-watcher.h
View File

@ -75,6 +75,7 @@ public:
/** /**
* @brief FileSystemWatcher * @brief FileSystemWatcher
* @param recursive if the watcher should watch the paths recursively. .
* @param events Events that shoude be concerned,default: FileSystemWatcher::EventMove | FileSystemWatcher::EventMoveSelf | * @param events Events that shoude be concerned,default: FileSystemWatcher::EventMove | FileSystemWatcher::EventMoveSelf |
FileSystemWatcher::EventCreate | FileSystemWatcher::EventDelete | FileSystemWatcher::EventCreate | FileSystemWatcher::EventDelete |
FileSystemWatcher::EventDeleteSelf | FileSystemWatcher::EventUnmount | FileSystemWatcher::EventDeleteSelf | FileSystemWatcher::EventUnmount |
@ -82,7 +83,8 @@ public:
* @param flags Watch flags. * @param flags Watch flags.
* @param parent * @param parent
*/ */
explicit FileSystemWatcher(WatchEvents events = WatchEvents(FileSystemWatcher::EventMove | FileSystemWatcher::EventMoveSelf | explicit FileSystemWatcher(bool recursive = true,
WatchEvents events = WatchEvents(FileSystemWatcher::EventMove | FileSystemWatcher::EventMoveSelf |
FileSystemWatcher::EventCreate | FileSystemWatcher::EventDelete | FileSystemWatcher::EventCreate | FileSystemWatcher::EventDelete |
FileSystemWatcher::EventDeleteSelf | FileSystemWatcher::EventUnmount | FileSystemWatcher::EventDeleteSelf | FileSystemWatcher::EventUnmount |
FileSystemWatcher::EventModify), FileSystemWatcher::EventModify),
@ -94,7 +96,7 @@ public:
FileSystemWatcher(FileSystemWatcher &) = delete; FileSystemWatcher(FileSystemWatcher &) = delete;
FileSystemWatcher &operator =(const FileSystemWatcher &) = delete; FileSystemWatcher &operator =(const FileSystemWatcher &) = delete;
bool isWatchingPath(const QString& path) const; // bool isWatchingPath(const QString& path) const;
public Q_SLOTS: public Q_SLOTS:
void addWatch(const QStringList &pathList); void addWatch(const QStringList &pathList);