Merged
Conversation
Added conditional compilation to support both Qt5 and Qt6 versions The change replaces QString::SkipEmptyParts with Qt::SkipEmptyParts for Qt6 while maintaining backward compatibility with Qt5 using preprocessor directives Influence: 1. Test file search functionality with both Qt5 and Qt6 builds 2. Verify blacklist matching works correctly with various path formats 3. Check that empty path segments are properly handled 4. Ensure no regression in path normalization and blacklist filtering refactor: 添加Qt6兼容性支持用于路径分割 添加条件编译以同时支持Qt5和Qt6版本 更改将QString::SkipEmptyParts替换为Qt::SkipEmptyParts用于Qt6 同时使用预处理器指令保持与Qt5的向后兼容性 Influence: 1. 测试Qt5和Qt6构建下的文件搜索功能 2. 验证黑名单匹配在各种路径格式下正常工作 3. 检查空路径段是否正确处理 4. 确保路径规范化和黑名单过滤功能无回归
Changed the URL construction logic to preserve the original URL's scheme and host instead of assuming all URLs are local files. Previously, QUrl::fromLocalFile() was used which would convert any URL to a file:// scheme. Now we maintain the original scheme by creating a copy of the input URL and only modifying its path component. This fix ensures compatibility with various URL schemes (like network protocols, custom schemes) that may be used in the file enumeration system. The change maintains the URL structure while properly constructing the path for child entries. Log: Fixed URL scheme preservation in file enumeration Influence: 1. Test file enumeration with different URL schemes (file://, smb://, etc.) 2. Verify that child file URLs maintain correct scheme and host information 3. Check that network file shares work correctly with the new URL construction 4. Test with custom URL schemes to ensure they are preserved 5. Verify that local file paths still work correctly fix: 构建文件URL时保留URL方案 修改了URL构建逻辑,保留原始URL的方案和主机信息,而不是假定所有URL都是本 地文件。之前使用QUrl::fromLocalFile()会将任何URL转换为file://方案。现在 通过创建输入URL的副本并仅修改其路径组件来维护原始方案。 此修复确保与文件枚举系统中可能使用的各种URL方案(如网络协议、自定义方 案)的兼容性。该更改在正确构建子条目路径的同时维护URL结构。 Log: 修复文件枚举中的URL方案保留问题 Influence: 1. 使用不同的URL方案(file://、smb://等)测试文件枚举 2. 验证子文件URL是否保持正确的方案和主机信息 3. 检查网络文件共享是否与新的URL构建方式正常工作 4. 使用自定义URL方案测试以确保它们被保留 5. 验证本地文件路径是否仍然正常工作 Bug: https://pms.uniontech.com/bug-view-352359.htm
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: Johnson-zs The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
deepin pr auto review这段代码修改包含两个文件的变更,我将分别对这两处修改进行审查,从语法逻辑、代码质量、代码性能和代码安全四个维度提出改进意见。 1. 文件:
|
Contributor
Author
|
/forcemerge |
|
This pr force merged! (status: blocked) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.