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

FilePath: Improve speed of ::relativePathFrom

Browse Source 
Change-Id: Ie7aef2aeb01251edd6825fcd56a73ab65b57cbf5
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Marcus Tillmanns
2024-04-02 15:51:53 +02:00
parent 1c905c6980
commit d3279f1e0b
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,9 +19,11 @@
#include <QFileInfo>
#include <QRegularExpression>
#include <QStringView>
#include <QUrl>
#include <QtGlobal>
#include <QTemporaryFile>
#include <QUrl>
#include <QtConcurrent>
#include <QtGlobal>
#ifdef Q_OS_WIN
#ifdef QTCREATOR_PCH_H
@@ -1497,21 +1499,28 @@ FilePath FilePath::relativePathFrom(const FilePath &anchor) const
FilePath absPath;
QString filename;
if (isFile()) {
const QList<FilePathInfo> infos
= QtConcurrent::blockingMapped(QList<FilePath>{*this, anchor}, [](const FilePath &path) {
return path.filePathInfo();
});
if (infos.first().fileFlags.testFlag(FilePathInfo::FileFlag::FileType)) {
absPath = absolutePath();
filename = fileName();
} else if (isDir()) {
} else if (infos.first().fileFlags.testFlag(FilePathInfo::FileFlag::DirectoryType)) {
absPath = absoluteFilePath();
} else {
return {};
}
FilePath absoluteAnchorPath;
if (anchor.isFile())
if (infos.last().fileFlags.testFlag(FilePathInfo::FileFlag::FileType))
absoluteAnchorPath = anchor.absolutePath();
else if (anchor.isDir())
else if (infos.last().fileFlags.testFlag(FilePathInfo::FileFlag::DirectoryType))
absoluteAnchorPath = anchor.absoluteFilePath();
else
return {};
QString relativeFilePath = calcRelativePath(absPath.pathView(), absoluteAnchorPath.pathView());
if (!filename.isEmpty()) {
if (relativeFilePath == ".")