Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-23 18:32:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kdecore: implement option to recurse into sub-directories from KDirWatch::addDir()

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2022-12-21 11:47:56 +02:00
parent 6160da3e6a
commit e921df61cf
3 changed files with 21 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
kdecore/io/kdirwatch.cpp
View file

@ -55,7 +55,7 @@ KDirWatch::~KDirWatch()
delete d;
}
void KDirWatch::addDir(const QString &path)
void KDirWatch::addDir(const QString &path, bool recurse)
{
if (path.isEmpty() || path.startsWith(QLatin1String("/dev"))) {
return; // Don't even go there.
@ -64,15 +64,22 @@ void KDirWatch::addDir(const QString &path)
}
kDebug(7001) << "watching directory" << path;
QString dirpath = path;
// watching non-existing directory requires a trailing slash
if (!path.endsWith(QDir::separator())) {
const QString dirpath = path + QDir::separator();
d->watcheddirs.append(dirpath);
d->watcher->addPath(dirpath);
return;
if (!dirpath.endsWith(QDir::separator())) {
dirpath.append(QDir::separator());
}
d->watcheddirs.append(dirpath);
d->watcher->addPath(dirpath);
if (recurse) {
QDir dir(dirpath);
foreach(const QFileInfo &info, dir.entryInfoList(QDir::NoDotAndDotDot | QDir::Dirs)) {
if (info.isDir()) {
addDir(info.absoluteFilePath(), recurse);
}
}
}
d->watcheddirs.append(path);
d->watcher->addPath(path);
}
void KDirWatch::addFile(const QString &path)

9
kdecore/io/kdirwatch.h
View file

@ -56,8 +56,9 @@ public:
/**
* Adds a directory to be watched.
* @param path the path to watch
* @param recurse add sub-directories aswell
*/
void addDir(const QString &path);
void addDir(const QString &path, bool recurse = false);
/**
* Adds a file to be watched.
@ -78,9 +79,9 @@ public:
void removeFile(const QString &file);
/**
* Check if a directory is being watched by this KDirWatch instance
* @param path the directory to check
* @return true if the directory is being watched
* Check if a file or directory is being watched by this KDirWatch instance
* @param path the file or directory to check
* @return true if the path is being watched
*/
bool contains(const QString &path) const;

2
kded/kded.cpp
View file

@ -460,7 +460,7 @@ void Kded::updateDirWatch()
if (m_pDirWatch->contains(path)) {
continue;
}
m_pDirWatch->addDir(path);
m_pDirWatch->addDir(path, true);
}
}