Skip to content
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

Jump to bottom

Metadata: parse new names #181

Merged
merged 2 commits into from
Apr 2, 2023
Merged

Metadata: parse new names #181

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
05184b7
parse new names:
Mar 23, 2023
13290e1
handle undefined name fallback
Mar 23, 2023
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
29 changes: 22 additions & 7 deletions src/chumpackage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,11 @@ void ChumPackage::setDetails(const PackageKit::Details &v) {
// Parse metadata
QJsonObject json{QJsonDocument::fromJson(metainjson).object()};

m_name = json.value("PackageName").toString(m_name);
if (json.value("PackageName").isUndefined()) {
m_name = json.value("Title").toString(m_name);
} else {
m_name = json.value("PackageName").toString(m_name); // spec v0 legacy
}

QString typestr = json.value("Type").toString(is_app ?
QStringLiteral("desktop-application") :
Expand All @@ -192,7 +196,9 @@ void ChumPackage::setDetails(const PackageKit::Details &v) {

m_developer_name = json.value("DeveloperName").toString();
m_developer_name_from_spec = !m_developer_name.isEmpty();
m_packager_name = json.value("PackagerName").toString();
m_packager_name = json.value("PackagedBy").toString();
if (m_packager_name.isEmpty()
m_packager_name = json.value("PackagerName").toString(); // spec v0 legacy
m_packager_name_from_spec = !m_packager_name.isEmpty();
m_categories = json.value("Categories").toVariant().toStringList();
// guess category only if it is empty
Expand All @@ -204,13 +210,22 @@ void ChumPackage::setDetails(const PackageKit::Details &v) {
m_packaging_repo_url = json.value("Custom").toObject().value("PackagingRepo").toString();
m_description_md_url = json.value("Custom").toObject().value("DescriptionMD").toString();

m_icon = json.value("Icon").toString();
m_icon = json.value("PackageIcon").toString();
if (m_icon.isEmpty()) m_icon = json.value("Icon").toString(); // spec v0 legacy

m_screenshots = json.value("Screenshots").toVariant().toStringList();

m_url = json.value("Url").toObject().value("Homepage").toString(m_url);
m_url_forum = json.value("Url").toObject().value("Help").toString();
m_url_issues = json.value("Url").toObject().value("Bugtracker").toString();
m_donation = json.value("Url").toObject().value("Donation").toString();
if (json.value("Url").isEmpty() { // spec v0 legacy
m_url = json.value("Links").toObject().value("Homepage").toString(m_url);
m_url_forum = json.value("Links").toObject().value("Help").toString();
m_url_issues = json.value("Links").toObject().value("Bugtracker").toString();
m_donation = json.value("Links").toObject().value("Donation").toString();
} else {
m_url = json.value("Url").toObject().value("Homepage").toString(m_url);
m_url_forum = json.value("Url").toObject().value("Help").toString();
m_url_issues = json.value("Url").toObject().value("Bugtracker").toString();
m_donation = json.value("Url").toObject().value("Donation").toString();
}

for (const QString &u: {m_repo_url, m_url, m_packaging_repo_url}) {
if (ProjectGitHub::isProject(u))
Expand Down