feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Utils: Add optional recursion for file system iteration

Browse Source 
Change-Id: Icded897b129aebd7132376cff55717e16dffc040
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2021-12-14 18:04:41 +01:00
parent 5cfe69b049
commit f9c97d23c7
17 changed files with 70 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/libs/utils/filepath.cpp
View File

@@ -37,6 +37,7 @@
#include <QDataStream>
#include <QDateTime>
#include <QDebug>
#include <QDirIterator>
#include <QFileInfo>
#include <QOperatingSystemVersion>
#include <QRegularExpression>
@@ -719,26 +720,41 @@ bool FilePath::createDir() const
FilePaths FilePath::dirEntries(const QStringList &nameFilters,
QDir::Filters filters,
QDirIterator::IteratorFlags flags,
QDir::SortFlags sort) const
{
FilePaths result;
if (needsDevice()) {
QTC_ASSERT(s_deviceHooks.iterateDirectory, return {});
FilePaths result;
const auto callBack = [&result](const FilePath &path) { result.append(path); return true; };
s_deviceHooks.iterateDirectory(*this, callBack, nameFilters, filters);
return result;
s_deviceHooks.iterateDirectory(*this, callBack, nameFilters, filters, flags);
} else {
QDirIterator dit(m_data, nameFilters, filters, flags);
while (dit.hasNext())
result.append(FilePath::fromString(dit.next()));
}
const QFileInfoList entryInfoList = QDir(m_data).entryInfoList(nameFilters, filters, sort);
return Utils::transform(entryInfoList, &FilePath::fromFileInfo);
// FIXME: Not all flags supported here.
if ((sort & QDir::SortByMask) == QDir::Name)
Utils::sort(result);
if (sort & QDir::Reversed)
std::reverse(result.begin(), result.end());
return result;
}
QList<FilePath> FilePath::dirEntries(QDir::Filters filters) const
FilePaths FilePath::dirEntries(QDir::Filters filters) const
{
return dirEntries({}, filters);
}
// This runs \a callBack on each directory entry matching all \a filters and
// either of the specified \a nameFilters.
// An empty \nameFilters list matches every name.
void FilePath::iterateDirectory(const std::function<bool(const FilePath &item)> &callBack,
const QStringList &nameFilters,
QDir::Filters filters,
@@ -746,14 +762,15 @@ void FilePath::iterateDirectory(const std::function<bool(const FilePath &item)>
{
if (needsDevice()) {
QTC_ASSERT(s_deviceHooks.iterateDirectory, return);
s_deviceHooks.iterateDirectory(*this, callBack, nameFilters, filters);
s_deviceHooks.iterateDirectory(*this, callBack, nameFilters, filters, flags);
return;
}
QDirIterator it(m_data, nameFilters, filters, flags);
while (it.hasNext())
while (it.hasNext()) {
if (!callBack(FilePath::fromString(it.next())))
return;
}
}
QByteArray FilePath::fileContents(qint64 maxSize, qint64 offset) const