feat: expose localized Keywords in the app model (linuxdeepin/developer-center#3375)

applets/dde-apps/amappitem.cpp

@@ -47,6 +47,7 @@ AMAppItem::AMAppItem(const QDBusObjectPath &path, const ObjectInterfaceMap &sour
     auto xDeepinVendor = appInfo.value(u8"X_Deepin_Vendor").toString();
     // Keep the default generic name for launchpad's English search while NameRole remains localized.
     AppItem::setGenericName(genericNameMap.value(DEFAULT_KEY));
+    AppItem::setKeywords(getLocaleOrDefaultValue(qdbus_cast<QStringListMap>(appInfo.value(u8"Keywords")), locale, DEFAULT_KEY));
     AppItem::setVendor(xDeepinVendor);
 
     if (QStringLiteral("deepin") == xDeepinVendor && !localizedGenericName.isEmpty()) {
@@ -124,12 +125,13 @@ void AMAppItem::setOnDesktop(bool on)
     AppItem::setOnDesktop(on);
 }
 
-QString AMAppItem::getLocaleOrDefaultValue(const QStringMap &value, const QString &localeCode, const QString &fallbackKey)
+template<typename T>
+T AMAppItem::getLocaleOrDefaultValue(const QMap<QString, T> &value, const QString &localeCode, const QString &fallbackKey) const
 {
     if (value.contains(localeCode)) {
         return value.value(localeCode);
     } else {
-        QString fallbackValue = value.value(fallbackKey);
+        T fallbackValue = value.value(fallbackKey);
         if (localeCode.contains('_')) {
             QString prefix = localeCode.split('_')[0];
             return value.value(prefix, fallbackValue);
@@ -178,6 +180,11 @@ void AMAppItem::onPropertyChanged(const QDBusMessage &msg)
                                      : localizedName);
     }
 
+    if (contains(QLatin1String("Keywords"))) {
+        const auto keywords = qdbus_cast<QStringListMap>(value(QLatin1String("Keywords")));
+        AppItem::setKeywords(getLocaleOrDefaultValue(keywords, locale, DEFAULT_KEY));
+    }
+
     if (contains(QLatin1String("Icons"))) {
         const auto icons = qdbus_cast<QStringMap>(value(QLatin1String("Icons")));
         AppItem::setAppIconName(icons.value(DESKTOP_ENTRY_ICON_KEY));

applets/dde-apps/amappitem.h

@@ -22,10 +22,15 @@
     void setOnDesktop(bool on) override;
 
 private:
-    QString getLocaleOrDefaultValue(const QStringMap &value, const QString &localeCode, const QString &fallbackKey);
+    // Name/GenericName use QString values, while Keywords uses QStringList values.
+    // T lets both reuse the existing locale fallback policy, including stopping
+    // at an existing key with an empty value, instead of adding a separate chain
+    // for Keywords.
+    template<typename T>
+    T getLocaleOrDefaultValue(const QMap<QString, T> &value, const QString &localeCode, const QString &fallbackKey) const;
     void updateActions(const QStringList &actions, const PropMap &actionName);
 
 private Q_SLOTS:
     void onPropertyChanged(const QDBusMessage &msg);
 };
 }

applets/dde-apps/amappitemmodel.cpp

@@ -24,6 +24,8 @@ AMAppItemModel::AMAppItemModel(QObject *parent)
     qDBusRegisterMetaType<ObjectMap>();
     qDBusRegisterMetaType<QStringMap>();
     qRegisterMetaType<QStringMap>();
+    qDBusRegisterMetaType<QStringListMap>();
+    qRegisterMetaType<QStringListMap>();
     qRegisterMetaType<PropMap>();
     qDBusRegisterMetaType<PropMap>();
     qDBusRegisterMetaType<QDBusObjectPath>();

applets/dde-apps/api/types/am.h

@@ -5,16 +5,20 @@
 #pragma once
 
 // from am global.h
 #include <QMap>
 #include <QString>
+#include <QStringList>
 #include <QDBusObjectPath>
 
 using ObjectInterfaceMap = QMap<QString, QVariantMap>;
 using ObjectMap = QMap<QDBusObjectPath, ObjectInterfaceMap>;
 using QStringMap = QMap<QString, QString>;
+// Match AM's locale -> keyword list D-Bus type without flattening locale information.
+using QStringListMap = QMap<QString, QStringList>;
 using PropMap = QMap<QString, QStringMap>;
 
 Q_DECLARE_METATYPE(ObjectInterfaceMap)
 Q_DECLARE_METATYPE(ObjectMap)
 Q_DECLARE_METATYPE(QStringMap)
+Q_DECLARE_METATYPE(QStringListMap)
 Q_DECLARE_METATYPE(PropMap)

applets/dde-apps/appitem.cpp

@@ -250,4 +250,14 @@
 {
     setData(genericName, AppItemModel::GenericNameRole);
 }
+
+QStringList AppItem::keywords() const
+{
+    return data(AppItemModel::KeywordsRole).toStringList();
+}
+
+void AppItem::setKeywords(const QStringList &keywords)
+{
+    setData(keywords, AppItemModel::KeywordsRole);
+}
 }

applets/dde-apps/appitem.h

@@ -82,7 +82,12 @@ class AppItem : public QStandardItem
     QString vendor() const;
     void setVendor(const QString &vendor);
 
+    // Share the fallback-selected GenericName with display and search consumers.
     QString genericName() const;
     void setGenericName(const QString &genericName);
+
+    // Store locale-selected Keywords for model consumers, avoiding a second metadata reader.
+    QStringList keywords() const;
+    void setKeywords(const QStringList &keywords);
 };
 }

applets/dde-apps/appitemmodel.cpp

@@ -34,6 +34,7 @@ QHash<int, QByteArray> AppItemModel::roleNames() const
             {AppItemModel::ExecsRole, QByteArrayLiteral("execs")},
             {AppItemModel::DesktopSourcePathRole, QByteArrayLiteral("desktopSourcePath")},
             {AppItemModel::VendorRole, QByteArrayLiteral("vendor")},
-            {AppItemModel::GenericNameRole, QByteArrayLiteral("genericName")}};
+            {AppItemModel::GenericNameRole, QByteArrayLiteral("genericName")},
+            {AppItemModel::KeywordsRole, QByteArrayLiteral("keywords")}};
 }
 }

applets/dde-apps/appitemmodel.h

@@ -36,6 +36,7 @@ class AppItemModel : public QStandardItemModel
         DesktopSourcePathRole,
         VendorRole,
         GenericNameRole,
+        KeywordsRole,     // Expose parsed, locale-selected Keywords through the shared app model.
     };
     Q_ENUM(Roles)