Skip to content

fix: validate CLI option compatibility with search type and apply file-extensions filter for content/ocr #345

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
deepin-bot merged 1 commit into from
Jul 11, 2026
Merged

fix: validate CLI option compatibility with search type and apply file-extensions filter for content/ocr #345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions src/dfm-search/dfm-search-client/cli_options.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,6 +453,27 @@ bool CliOptions::parse(QCoreApplication &app, SearchCliConfig &config)
}
}

// Validate option compatibility with search type
if (config.searchType == SearchType::FileName) {
if (m_parser.isSet(m_filenameOption)) {
std::cerr << "Error: --filename is only valid for content/ocr search, not filename search" << std::endl;
return false;
}
} else {
if (m_parser.isSet(m_pinyinOption)) {
std::cerr << "Error: --pinyin is only valid for filename search" << std::endl;
return false;
}
if (m_parser.isSet(m_pinyinAcronymOption)) {
std::cerr << "Error: --pinyin-acronym is only valid for filename search" << std::endl;
return false;
}
if (m_parser.isSet(m_fileTypesOption)) {
std::cerr << "Error: --file-types is only valid for filename search" << std::endl;
return false;
}
}

return true;
}

Expand Down
6 changes: 6 additions & 0 deletions src/dfm-search/dfm-search-client/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,9 @@ static void configureSearchOptions(SearchOptions &options, const SearchCliConfig
if (!config.filenameKeyword.isEmpty()) {
contentOptions.setFilenameKeyword(config.filenameKeyword);
}
if (!config.fileExtensions.isEmpty()) {
contentOptions.setFileExtensions(config.fileExtensions);
}
} else if (config.searchType == SearchType::Ocr) {
OcrTextOptionsAPI ocrTextOptions(options);
ocrTextOptions.setMaxPreviewLength(config.maxPreviewLength);
Expand All @@ -77,6 +80,9 @@ static void configureSearchOptions(SearchOptions &options, const SearchCliConfig
if (!config.filenameKeyword.isEmpty()) {
ocrTextOptions.setFilenameKeyword(config.filenameKeyword);
}
if (!config.fileExtensions.isEmpty()) {
ocrTextOptions.setFileExtensions(config.fileExtensions);
}
}

// 应用时间范围过滤
Expand Down
Loading