Skip to content

refactor: optimize extension mapping in docparser #39

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
Mar 31, 2025
Merged

refactor: optimize extension mapping in docparser #39

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
85 changes: 48 additions & 37 deletions src/docparser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,54 +97,62 @@
return std::make_unique<ofd::Ofd>(filename);
}

// 缓存后缀到创建函数的映射
static const std::unordered_map<std::string, FileCreator> extensionMap = {
{ "docx", createDocx },
{ "pptx", createPptx },
{ "ppsx", createPptx },
{ "doc", createDoc },
{ "dot", createDoc },
{ "wps", createDoc },
{ "rtf", createRtf },
{ "odg", createOdf },
{ "odt", createOdf },
{ "ods", createOdf },
{ "odp", createOdf },
{ "xls", createExcel },
{ "xlsx", createExcel },
{ "xlsb", createXlsb },
{ "ppt", createPpt },
{ "pps", createPpt },
{ "dps", createPpt },
{ "pot", createPpt },
{ "pdf", createPdf },
{ "ofd", createOfd }
};

// 缓存相似后缀的映射关系
static const std::unordered_map<std::string, std::string> similarExtensionMap = {
{ "doc", "docx" },
{ "docx", "doc" },
{ "xls", "xlsx" },
{ "xlsx", "xls" },
{ "ppt", "pptx" },
{ "pptx", "ppt" }
};
// Caching the mapping of extensions to creation functions
static const std::unordered_map<std::string, FileCreator> createExtensionMap()
{
return {
{ "docx", createDocx },
{ "pptx", createPptx },
{ "ppsx", createPptx },
{ "doc", createDoc },
{ "dot", createDoc },
{ "wps", createDoc },
{ "rtf", createRtf },
{ "odg", createOdf },
{ "odt", createOdf },
{ "ods", createOdf },
{ "odp", createOdf },
{ "xls", createExcel },
{ "xlsx", createExcel },
{ "xlsb", createXlsb },
{ "ppt", createPpt },
{ "pps", createPpt },
{ "dps", createPpt },
{ "pot", createPpt },
{ "pdf", createPdf },
{ "ofd", createOfd }
};
}

static const std::unordered_map<std::string, std::string> createSimilarExtensionMap()
{
return {
{ "doc", "docx" },
{ "docx", "doc" },
{ "xls", "xlsx" },
{ "xlsx", "xls" },
{ "ppt", "pptx" },
{ "pptx", "ppt" }
};
}

static std::string doConvertFile(const std::string &filename, std::string suffix)
{
// 转换后缀为小写
static const std::unordered_map<std::string, FileCreator> extensionMap = createExtensionMap();
static const std::unordered_map<std::string, std::string> similarExtensionMap = createSimilarExtensionMap();

Check warning on line 142 in src/docparser.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

Variable 'similarExtensionMap' is assigned a value that is never used.

// Convert suffix to lowercase
std::transform(suffix.begin(), suffix.end(), suffix.begin(),
[](unsigned char c) { return std::tolower(c); });

std::unique_ptr<fileext::FileExtension> document;

try {
// 先检查是否是文本文件
// First check if it is a text file
if (isTextSuffix(suffix)) {
document = createTxt(filename, suffix);
} else {
// 查找对应的创建函数
// Find the corresponding creation function
auto it = extensionMap.find(suffix);
if (it != extensionMap.end()) {
document = it->second(filename, suffix);
Expand All @@ -154,7 +162,7 @@
}

document->convert();
// 使用移动语义避免复制
// Use move semantics to avoid copying
return std::move(document->m_text);
} catch (const std::logic_error &error) {
std::cout << error.what() << std::endl;
Expand Down Expand Up @@ -182,6 +190,9 @@
return content;

// 尝试相似后缀
static const std::unordered_map<std::string, FileCreator> extensionMap = createExtensionMap();

Check warning on line 193 in src/docparser.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

Variable 'extensionMap' is assigned a value that is never used.
static const std::unordered_map<std::string, std::string> similarExtensionMap = createSimilarExtensionMap();

auto it = similarExtensionMap.find(suffix);
if (it != similarExtensionMap.end()) {
return doConvertFile(filename, it->second);
Expand Down