Skip to content

fix(index): align dmanHelper md prefix selection with manual open logic - #633

Merged
deepin-bot[bot] merged 1 commit into
linuxdeepin:masterfrom
dengzhongyuan365-dev:master
Jul 8, 2026
Merged

fix(index): align dmanHelper md prefix selection with manual open logic#633
deepin-bot[bot] merged 1 commit into
linuxdeepin:masterfrom
dengzhongyuan365-dev:master

Conversation

@dengzhongyuan365-dev

Copy link
Copy Markdown
Member

Use systemToOmitCompat() when dmanHelper selects markdown files for search indexing, keeping it consistent with dman manual opening logic. This allows non-community editions such as Education to index p_ prefixed manual files when no edu_ files exist, preventing searchable content like deepin-movie from being skipped during index generation.

同步 dmanHelper 搜索索引构建时的文档前缀选择逻辑,使其与 dman 主程序
打开手册时保持一致。教育版等非社区版本将按 p_ 前缀建立索引,避免因
仅匹配 edu_ 前缀导致 deepin-movie 等应用文档未写入搜索库。

Log: 修复教育版环境下部分应用文档未建立搜索索引导致搜索不到的问题
PMS: BUG-369331

Influence: 影响 dmanHelper 搜索索引构建逻辑,使搜索索引选择的文档版本与手册打开逻辑一致;解决教育版环境下 deepin-movie 等仅提供 p_/d_ 文档的应用无法被搜索到的问题,不影响手册打开、应用列表展示及已有搜索查询流程。

@sourcery-ai sourcery-ai Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry @dengzhongyuan365-dev, you have reached your weekly rate limit of 500000 diff characters.

Please try again later or upgrade to continue using Sourcery

Use systemToOmitCompat() when dmanHelper selects markdown files for
search indexing, keeping it consistent with dman manual opening logic.
This allows non-community editions such as Education to index p_ prefixed
manual files when no edu_ files exist, preventing searchable content like
deepin-movie from being skipped during index generation.

同步dmanHelper 搜索索引构建时的文档前缀选择逻辑,使其与 dman 主程序
打开手册时保持一致。教育版等非社区版本将按 p_ 前缀建立索引,避免因
仅匹配 edu_ 前缀导致 deepin-movie 等应用文档未写入搜索库。

Log: 修复教育版环境下部分应用文档未建立搜索索引导致搜索不到的问题
PMS: BUG-369331

Influence: 影响 dmanHelper 搜索索引构建逻辑,使搜索索引选择的文档版本与手册打开逻辑一致;解决教育版环境下 deepin-movie 等仅提供 p_/d_ 文档的应用无法被搜索到的问题,不影响手册打开、应用列表展示及已有搜索查询流程。
@deepin-ci-robot

Copy link
Copy Markdown

deepin pr auto review

★ 总体评分:100分

■ 【总体评价】

代码精准修复了系统版本兼容性获取忽略模块列表的函数调用错误,无任何副作用
逻辑完全正确且无安全风险,给予满分

■ 【详细分析】

  • 1.语法逻辑(完全正确)✓
    在src/controller/helpermanager.cpp的handlePriority函数中,将错误的Utils::systemToOmit调用精准替换为Utils::systemToOmitCompat,符合修复兼容性问题的预期目标,函数签名与返回值赋值均保持一致
    建议:无需改进
  • 2.代码质量(良好)✓
    修改范围极小且聚焦,仅变更存在问题的单行代码,未引入无关修改,符合最小化变更原则,且上下文保留了有效的qCDebug日志用于问题追踪
    建议:无需改进
  • 3.代码性能(无性能问题)✓
    仅替换同级工具函数调用,未增加额外的计算开销、循环或系统调用
    建议:无需改进
  • 4.代码安全(存在0个安全漏洞)✓
    漏洞对比统计:新增漏洞 0 个,减少漏洞 0 个,持平 0 个
    代码仅涉及内部静态工具函数的调用替换,未引入外部不可信输入,无命令注入、路径遍历或内存越界等风险
  • 建议:保持当前安全的编码方式

■ 【改进建议代码示例】

diff --git a/src/controller/helpermanager.cpp b/src/controller/helpermanager.cpp
index 1a65ac79..d2ddea2c 100644
--- a/src/controller/helpermanager.cpp
+++ b/src/controller/helpermanager.cpp
@@ -428,7 +428,7 @@ void helperManager::dbusSend(const QStringList &deleteList, const QStringList &a
 QStringList helperManager::handlePriority(const QStringList &list)
 {
     qCDebug(app) << list;
-    QStringList omitType = Utils::systemToOmit(Utils::uosEditionType());
+    QStringList omitType = Utils::systemToOmitCompat(Utils::uosEditionType());
     qCDebug(app) << omitType;
     QStringList moduleList;
     QStringList retList;

@deepin-ci-robot

Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: dengzhongyuan365-dev, lzwind

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@dengzhongyuan365-dev

Copy link
Copy Markdown
Member Author

/forcemerge

@deepin-bot

deepin-bot Bot commented Jul 8, 2026

Copy link
Copy Markdown
Contributor

This pr force merged! (status: unstable)

@deepin-bot
deepin-bot Bot merged commit 1329e14 into linuxdeepin:master Jul 8, 2026
18 of 20 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants