Skip to content

feat: [xps] harmonize metadata fields and outline diagnostics #204

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
Nov 13, 2025
Merged

feat: [xps] harmonize metadata fields and outline diagnostics #204

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
34 changes: 26 additions & 8 deletions reader/document/XpsDocumentAdapter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ QString toQString(const gchar *value)
return QString::fromUtf8(value);
}

QString normalizedString(const gchar *value, const QString &fallback = QStringLiteral("未知"))
QString normalizedString(const gchar *value, const QString &fallback = QString())
{
QString result = toQString(value).trimmed();
return result.isEmpty() ? fallback : result;
Expand Down Expand Up @@ -635,21 +635,33 @@ void XpsDocumentAdapter::ensureProperties() const
logGError(QStringLiteral("gxps_file_get_core_properties failed"), coreError.get());
}
} else {
props["Title"] = normalizedString(gxps_core_properties_get_title(core.get()));
props["Author"] = normalizedString(gxps_core_properties_get_creator(core.get()));
props["Subject"] = normalizedString(gxps_core_properties_get_subject(core.get()), QString());
props["Keywords"] = normalizedString(gxps_core_properties_get_keywords(core.get()), QString());
props["Description"] = normalizedString(gxps_core_properties_get_description(core.get()), QString());
props["Version"] = normalizedString(gxps_core_properties_get_version(core.get()), QString());
props["Creator"] = normalizedString(gxps_core_properties_get_last_modified_by(core.get()), QString());
const auto setPropertyWithLog = [&](const QString &key, const gchar *value) {
const QString text = normalizedString(value);
if (text.isEmpty()) {
qCDebug(appLog) << "XPS metadata missing or empty field:" << key;
}
props[key] = text;
};

setPropertyWithLog(QStringLiteral("Title"), gxps_core_properties_get_title(core.get()));
setPropertyWithLog(QStringLiteral("Author"), gxps_core_properties_get_creator(core.get()));
setPropertyWithLog(QStringLiteral("Subject"), gxps_core_properties_get_subject(core.get()));
setPropertyWithLog(QStringLiteral("KeyWords"), gxps_core_properties_get_keywords(core.get()));
setPropertyWithLog(QStringLiteral("Description"), gxps_core_properties_get_description(core.get()));
setPropertyWithLog(QStringLiteral("Version"), gxps_core_properties_get_version(core.get()));
setPropertyWithLog(QStringLiteral("Creator"), gxps_core_properties_get_last_modified_by(core.get()));

const QDateTime created = fromUnixTime(gxps_core_properties_get_created(core.get()));
const QDateTime modified = fromUnixTime(gxps_core_properties_get_modified(core.get()));
if (created.isValid()) {
props["CreationDate"] = created;
} else {
qCDebug(appLog) << "XPS metadata CreationDate missing or invalid";
}
if (modified.isValid()) {
props["ModificationDate"] = modified;
} else {
qCDebug(appLog) << "XPS metadata ModificationDate missing or invalid";
}
}

Expand Down Expand Up @@ -677,10 +689,12 @@ void XpsDocumentAdapter::ensureOutline() const

GObjectPtr<GXPSDocumentStructure> structure(gxps_document_get_structure(m_handle->document));
if (!structure) {
qCDebug(appLog) << "XPS document has no structure section, outline unavailable";
return;
}

if (!gxps_document_structure_has_outline(structure.get())) {
qCDebug(appLog) << "XPS document structure present but outline is empty";
return;
}

Expand Down Expand Up @@ -741,6 +755,10 @@ void XpsDocumentAdapter::ensureOutline() const
result.append(buildSection(&iter));
} while (gxps_outline_iter_next(&iter));

if (result.isEmpty()) {
qCDebug(appLog) << "XPS outline iterator completed but no sections were generated";
}

m_outline = result;
}

Expand Down
18 changes: 16 additions & 2 deletions reader/uiframe/DocSheet.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1186,13 +1186,27 @@ void DocSheet::docBasicInfo(deepin_reader::FileInfo &tFileInfo)
tFileInfo.size = fileInfo.size();
tFileInfo.createTime = fileInfo.birthTime();
tFileInfo.changeTime = fileInfo.lastModified();
tFileInfo.auther = fileInfo.owner();
tFileInfo.filePath = fileInfo.filePath();

const Properties &propertys = m_renderer->properties();
tFileInfo.format = format();
tFileInfo.optimization = propertys.value("Linearized").toBool();
tFileInfo.keyword = propertys.value("KeyWords").toString();
QString keywords = propertys.value("KeyWords").toString();
if (keywords.isEmpty()) {
keywords = propertys.value("Keywords").toString();
}
tFileInfo.keyword = keywords;

QString author = propertys.value("Author").toString();
if (author.isEmpty()) {
author = propertys.value("Creator").toString();
}
if (author.isEmpty()) {
author = fileInfo.owner();
qCDebug(appLog) << "Using file owner as fallback author for document";
}
tFileInfo.auther = author;

tFileInfo.theme = propertys.value("Title").toString();
tFileInfo.producter = propertys.value("Producer").toString();
tFileInfo.creater = propertys.value("Creator").toString();
Expand Down