fix: fix DCI file engine compatibility issues in Qt6

1. Fixed DDciFileEngineIterator constructor signatures for Qt 6.8.0
and above
2. Updated file filtering logic to use new QDirListing::IteratorFlags in
Qt 6.8.0+
3. Modified fileName() method to return fileName() instead of baseName()
for BaseName case in Qt6
4. Added m_listingFilters member to store iterator flags in Qt 6.8.0+
5. Updated beginEntryList methods to pass path parameter to iterator
constructor
6. Fixed conditional compilation for different Qt versions to ensure
proper API usage

The changes address unit test failures in Qt6 environment by adapting to
API changes in Qt 6.8.0 and later versions. Specifically:
- Qt 6.8.0 introduced new iterator constructors requiring path parameter
- QDirListing::IteratorFlags replaced QDir::Filters for some APIs
- BaseName behavior changed in Qt6 requiring different implementation
- File filtering logic needed updates for new flag handling

Log: Fixed DCI file engine compatibility with Qt6

Influence:
1. Test file listing operations with various filter combinations
2. Verify file name extraction for different file types
3. Test symlink handling in file listings
4. Verify directory traversal functionality
5. Test cross-version compatibility with different Qt versions
6. Validate file engine operations in unit tests

fix: 修复DCI文件引擎在Qt6下的兼容性问题

1. 为Qt 6.8.0及以上版本修复DDciFileEngineIterator构造函数签名
2. 更新文件过滤逻辑以在Qt 6.8.0+中使用新的QDirListing::IteratorFlags
3. 修改fileName()方法，在Qt6中为BaseName情况返回fileName()而不是
baseName()
4. 添加m_listingFilters成员以在Qt 6.8.0+中存储迭代器标志
5. 更新beginEntryList方法以将路径参数传递给迭代器构造函数
6. 修复不同Qt版本的条件编译以确保正确的API使用

这些更改解决了Qt6环境中的单元测试失败问题，通过适配Qt 6.8.0及更高版本中
的API变更。具体包括：
- Qt 6.8.0引入了需要路径参数的新迭代器构造函数
- QDirListing::IteratorFlags在某些API中替换了QDir::Filters
- Qt6中BaseName行为变更需要不同的实现
- 文件过滤逻辑需要更新以适应新的标志处理方式

Log: 修复DCI文件引擎与Qt6的兼容性问题

Influence:
1. 测试使用各种过滤器组合的文件列表操作
2. 验证不同文件类型的文件名提取
3. 测试文件列表中的符号链接处理
4. 验证目录遍历功能
5. 测试与不同Qt版本的跨版本兼容性
6. 在单元测试中验证文件引擎操作

Author: 18202781743

src/dci/private/ddcifileengine.cpp

@@ -76,21 +76,20 @@ static DDciFileShared getDciFile(const QString &dciFilePath, bool usePath = true
     return shared;
 }
 
+#if QT_VERSION < QT_VERSION_CHECK(6, 8, 0)
 DDciFileEngineIterator::DDciFileEngineIterator(QDir::Filters filters, const QStringList &nameFilters)
-#if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
-    : QAbstractFileEngineIterator(nullptr, filters, nameFilters)
-#else
     : QAbstractFileEngineIterator(filters, nameFilters)
-#endif
 {
-
 }
-
-#if QT_VERSION >= QT_VERSION_CHECK(6, 8, 1)
-DDciFileEngineIterator::DDciFileEngineIterator(QDirListing::IteratorFlags filters, const QStringList &nameFilters)
-    : QAbstractFileEngineIterator(nullptr, filters, nameFilters)
+#else
+DDciFileEngineIterator::DDciFileEngineIterator(const QString &path, QDir::Filters filters, const QStringList &nameFilters)
+    : QAbstractFileEngineIterator(path, filters, nameFilters)
 {
+}
 
+DDciFileEngineIterator::DDciFileEngineIterator(const QString &path, QDirListing::IteratorFlags filters, const QStringList &nameFilters)
+    : QAbstractFileEngineIterator(path, filters, nameFilters)
+{
 }
 #endif
 
@@ -116,18 +115,33 @@ bool DDciFileEngineIterator::advance()
         list = file->list(paths.second);
     }
 
+    bool excludeDirs = false, excludeFiles = false, excludeSymlinks = false;
+#if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
+    if (this->m_listingFilters) {
+        const auto filters = this->m_listingFilters.value();
+        excludeDirs = filters.testFlag(QDirListing::IteratorFlag::ExcludeDirs);
+        excludeFiles = filters.testFlag(QDirListing::IteratorFlag::ExcludeFiles);
+        excludeSymlinks = filters.testFlag(QDirListing::IteratorFlag::ExcludeSpecial) && !filters.testFlag(QDirListing::IteratorFlag::ResolveSymlinks);
+    } else
+#endif
+    {
+        const auto filters = this->filters();
+        excludeDirs = !filters.testFlag(QDir::Dirs);
+        excludeFiles = !filters.testFlag(QDir::Files);
+        excludeSymlinks = filters.testFlag(QDir::NoSymLinks);
+    }
+
     for (int i = current + 1; i < list.count(); ++i) {
         // 先检查文件类型
-        const auto filters = this->filters();
         const auto fileType = file->type(list.at(i));
         if (fileType == DDciFile::Directory) {
-            if (!filters.testFlag(QDir::Files))
+            if (excludeDirs)
                 continue;
         } else if (fileType == DDciFile::File) {
-            if (!filters.testFlag(QDir::Files))
+            if (excludeFiles)
                 continue;
         } else if (fileType == DDciFile::Symlink) {
-            if (filters.testFlag(QDir::NoSymLinks))
+            if (excludeSymlinks)
                 continue;
         } else { // DDciFile::UnknowFile
             continue;
@@ -527,7 +541,7 @@ QString DDciFileEngine::fileName(QAbstractFileEngine::FileName file) const
     case AbsolutePathName:
         return QDir::cleanPath(DCI_FILE_SCHEME + dciFilePath);
     case BaseName:
-        return QFileInfo(subfilePath).baseName();
+        return QFileInfo(subfilePath).fileName();
 #if QT_VERSION >= QT_VERSION_CHECK(6, 4, 0)
     case AbsoluteLinkTarget:
 #else
@@ -572,22 +586,28 @@ QDateTime DDciFileEngine::fileTime(QAbstractFileEngine::FileTime time) const
     return QFileInfo(dciFilePath).fileTime(static_cast<QFile::FileTime>(time));
 }
 #endif
-#if QT_VERSION >= QT_VERSION_CHECK(6, 8, 1)
-QAbstractFileEngine::IteratorUniquePtr DDciFileEngine::beginEntryList(const QString &path, QDirListing::IteratorFlags filters, const QStringList &filterNames)
-#elif QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
+#if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
 QAbstractFileEngine::IteratorUniquePtr DDciFileEngine::beginEntryList(const QString &path, QDir::Filters filters, const QStringList &filterNames)
 #else
 DDciFileEngine::Iterator *DDciFileEngine::beginEntryList(QDir::Filters filters, const QStringList &filterNames)
 #endif
 {
 #if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
-    Q_UNUSED(path);
-    return QAbstractFileEngine::IteratorUniquePtr(new DDciFileEngineIterator(filters, filterNames));
+    return QAbstractFileEngine::IteratorUniquePtr(new DDciFileEngineIterator(path, filters, filterNames));
 #else
     return new DDciFileEngineIterator(filters, filterNames);
 #endif
 }
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
+QAbstractFileEngine::IteratorUniquePtr DDciFileEngine::beginEntryList(const QString &path, QDirListing::IteratorFlags filters, const QStringList &filterNames)
+{
+    auto iterator = new DDciFileEngineIterator(path, filters, filterNames);
+    iterator->m_listingFilters = filters;
+    return QAbstractFileEngine::IteratorUniquePtr(iterator);
+}
+#endif
+
 #if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
 QAbstractFileEngine::IteratorUniquePtr DDciFileEngine::endEntryList()
 #else

src/dci/private/ddcifileengine_p.h

@@ -37,13 +37,17 @@ class DDciFileEngineIterator : public QAbstractFileEngineIterator
 {
     friend class DDciFileEngine;
 public:
+#if QT_VERSION < QT_VERSION_CHECK(6, 8, 0)
     DDciFileEngineIterator(QDir::Filters filters, const QStringList &nameFilters);
+#else
+    DDciFileEngineIterator(const QString &path, QDir::Filters filters, const QStringList &nameFilters);
+    DDciFileEngineIterator(const QString &path, QDirListing::IteratorFlags filters, const QStringList &nameFilters);
+#endif
 
 #if QT_VERSION < QT_VERSION_CHECK(6, 8, 0)
     QString next() override;
     bool hasNext() const override;
 #else
-    DDciFileEngineIterator(QDirListing::IteratorFlags filters, const QStringList &nameFilters);
     bool advance() override;
 #endif
 
@@ -54,6 +58,9 @@ class DDciFileEngineIterator : public QAbstractFileEngineIterator
     mutable QStringList list;
     mutable int nextValid = -1;
     int current = -1;
+#if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
+    std::optional<QDirListing::IteratorFlags> m_listingFilters {std::nullopt};
+#endif
 };
 
 class DDciFileEngine : public QAbstractFileEngine
@@ -111,10 +118,8 @@ class DDciFileEngine : public QAbstractFileEngine
 #endif
 
     typedef DDciFileEngineIterator Iterator;
-#if QT_VERSION >= QT_VERSION_CHECK(6, 8, 1)
+#if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
     IteratorUniquePtr beginEntryList(const QString &path, QDirListing::IteratorFlags filters, const QStringList &filterNames) override;
-    IteratorUniquePtr endEntryList() override;
-#elif QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
     IteratorUniquePtr beginEntryList(const QString &path, QDir::Filters filters, const QStringList &filterNames) override;
     IteratorUniquePtr endEntryList() override;
 #else