From ff0030ec573ef4071dc21d254092b4ed1aa7278e Mon Sep 17 00:00:00 2001 From: Camila Ayres Date: Wed, 11 Dec 2024 19:28:57 +0100 Subject: [PATCH] Include folders when displaying the local metadata about a conflict. Signed-off-by: Camila Ayres --- src/gui/caseclashfilenamedialog.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/gui/caseclashfilenamedialog.cpp b/src/gui/caseclashfilenamedialog.cpp index 88a152b98e42d..92f3c768962b9 100644 --- a/src/gui/caseclashfilenamedialog.cpp +++ b/src/gui/caseclashfilenamedialog.cpp @@ -175,6 +175,7 @@ QString CaseClashFilenameDialog::caseClashConflictFile(const QString &conflictFi { const auto filePathFileInfo = QFileInfo(conflictFilePath); const auto conflictFileName = filePathFileInfo.fileName(); + const auto lookingForDirectory = FileSystem::isDir(filePathFileInfo.absoluteFilePath()); QDirIterator it(filePathFileInfo.path(), QDirIterator::Subdirectories); @@ -182,15 +183,16 @@ QString CaseClashFilenameDialog::caseClashConflictFile(const QString &conflictFi const auto filePath = it.next(); qCDebug(lcCaseClashConflictFialog) << filePath; - if (FileSystem::isDir(filePath)) { + if (FileSystem::isDir(filePath) && !lookingForDirectory) { continue; } - QFileInfo fileInfo(filePath); - const auto currentFileName = fileInfo.fileName(); - if (currentFileName.compare(conflictFileName, Qt::CaseInsensitive) == 0 && - currentFileName != conflictFileName) { + const auto currentFileName = QFileInfo(filePath).fileName(); + if (currentFileName.compare(conflictFileName, Qt::CaseInsensitive) != 0) { + continue; + } + if (currentFileName != conflictFileName) { return filePath; } }