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

Utils: Simplify remaining Environment::searchInPath implementation

Browse Source 
Use the parts that have recently been copied/moved to FilePath

Change-Id: I4d5b5941c55052e58ae4b34c4c49432f63a13cde
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
hjk
2023-05-23 11:37:16 +02:00
parent 5689f0c60e
commit 6ab66690af
1 changed files with 3 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
src/libs/utils/environment.cpp
View File

@@ -212,111 +212,18 @@ void Environment::setupEnglishOutput()
using SearchResultCallback = std::function<IterationPolicy(const FilePath &)>; using SearchResultCallback = std::function<IterationPolicy(const FilePath &)>;
static IterationPolicy searchInDirectory(const SearchResultCallback &resultCallback,
const FilePaths &execs,
const FilePath &directory,
QSet<FilePath> &alreadyCheckedDirectories,
const FilePathPredicate &filter = {})
{
// Compare the initial size of the set with the size after insertion to check if the directory
// was already checked.
const int initialCount = alreadyCheckedDirectories.count();
alreadyCheckedDirectories.insert(directory);
const bool wasAlreadyChecked = alreadyCheckedDirectories.count() == initialCount;
if (directory.isEmpty() || wasAlreadyChecked)
return IterationPolicy::Continue;
for (const FilePath &exec : execs) {
const FilePath filePath = directory / exec.path();
if (filePath.isExecutableFile() && (!filter || filter(filePath))) {
if (resultCallback(filePath) == IterationPolicy::Stop)
return IterationPolicy::Stop;
}
}
return IterationPolicy::Continue;
}
static FilePaths appendExeExtensions(const Environment &env, const FilePath &executable)
{
FilePaths execs{executable};
if (env.osType() == OsTypeWindows) {
// Check all the executable extensions on windows:
// PATHEXT is only used if the executable has no extension
if (executable.suffix().isEmpty()) {
const QStringList extensions = env.expandedValueForKey("PATHEXT").split(';');
for (const QString &ext : extensions)
execs << executable.stringAppended(ext.toLower());
}
}
return execs;
}
QString Environment::expandedValueForKey(const QString &key) const QString Environment::expandedValueForKey(const QString &key) const
{ {
const NameValueDictionary &dict = resolved(); const NameValueDictionary &dict = resolved();
return expandVariables(dict.value(key)); return expandVariables(dict.value(key));
} }
static void searchInDirectoriesHelper(const SearchResultCallback &resultCallback,
const Environment &env,
const QString &executable,
const FilePaths &dirs,
const FilePathPredicate &func,
bool usePath)
{
if (executable.isEmpty())
return;
const FilePath exec = FilePath::fromUserInput(QDir::cleanPath(env.expandVariables(executable)));
const FilePaths execs = appendExeExtensions(env, exec);
if (exec.isAbsolutePath()) {
for (const FilePath &path : execs) {
if (path.isExecutableFile() && (!func || func(path)))
if (resultCallback(path) == IterationPolicy::Stop)
return;
}
return;
}
QSet<FilePath> alreadyCheckedDirectories;
for (const FilePath &dir : dirs) {
if (searchInDirectory(resultCallback, execs, dir, alreadyCheckedDirectories, func)
== IterationPolicy::Stop)
return;
}
if (usePath) {
QTC_ASSERT(!executable.contains('/'), return);
for (const FilePath &p : env.path()) {
if (searchInDirectory(resultCallback, execs, p, alreadyCheckedDirectories, func)
== IterationPolicy::Stop)
return;
}
}
return;
}
FilePath Environment::searchInPath(const QString &executable, FilePath Environment::searchInPath(const QString &executable,
const FilePaths &additionalDirs, const FilePaths &additionalDirs,
const FilePathPredicate &func) const const FilePathPredicate &filter) const
{ {
FilePath result; const FilePath exec = FilePath::fromUserInput(expandVariables(executable));
searchInDirectoriesHelper( return exec.searchInPath(additionalDirs, {}, filter, FilePath::WithAnySuffix);
[&result](const FilePath &path) {
result = path;
return IterationPolicy::Stop;
},
*this,
executable,
additionalDirs,
func,
true);
return result;
} }
FilePaths Environment::path() const FilePaths Environment::path() const