chore: notify settings and icon tweak

dde-osd/src/notification/bubblemanager.cpp

@@ -15,6 +15,7 @@
 #include "signalbridge.h"
 
 #include <DDesktopServices>
+#include <DSGApplication>
 
 #include <QStringList>
 #include <QVariantMap>
@@ -145,6 +146,17 @@ uint BubbleManager::Notify(const QString &appName, uint replacesId,
                            const QString &body, const QStringList &actions,
                            const QVariantMap hints, int expireTimeout)
 {
+DCORE_USE_NAMESPACE
+
+    QString servicePid, appId;
+    if (calledFromDBus()) {
+        QDBusReply<uint> reply = connection().interface()->servicePid(message().service());
+        servicePid = QString::number(reply.value());
+        appId = DSGApplication::getId(reply.value());
+    }
+    if (appId.isEmpty())
+        appId = appName;
+
     if (calledFromDBus()) {
         QGSettings oem_setting("com.deepin.dde.notifications", "/com/deepin/dde/notifications/");
         if (oem_setting.keys().contains("notifycationClosed") && oem_setting.get("notifycationClosed").toBool())
@@ -156,17 +168,22 @@ uint BubbleManager::Notify(const QString &appName, uint replacesId,
                      << "appIcon:" + appIcon << "summary:" + summary << "body:" + body
                      << "actions:" << actions << "hints:" << hints << "expireTimeout:" << expireTimeout;
 
-            // 记录通知发送方
-            QString cmd = QString("grep \"Name:\" /proc/%1/status").arg(QString::number(connection().interface()->servicePid(message().service())));
-            QProcess process;
-            QStringList args;
-            args << "-c";
-            args << cmd;
-            process.start("sh", args);
-            process.waitForReadyRead();
-            QString result = QString::fromUtf8(process.readAllStandardOutput());
-            qDebug() << "notify called by :" << result;
-            process.close();
+            qDebug() << "servicePid" << servicePid << "appid" << appId;
+
+            if (!servicePid.isEmpty()) {
+                // 记录通知发送方
+                QString cmd = QString("grep \"Name:\" /proc/%1/status").arg(servicePid);
+                QProcess process;
+                QStringList args;
+                args << "-c";
+                args << cmd;
+                process.start("sh", args);
+                process.waitForReadyRead();
+                qDebug() << "cmd :" << cmd;
+                QString result = QString::fromUtf8(process.readAllStandardOutput());
+                qDebug() << "notify called by :" << result;
+                process.close();
+            }
         }
     }
 
@@ -179,16 +196,19 @@ uint BubbleManager::Notify(const QString &appName, uint replacesId,
     }
 
     // 应用通知功能未开启不做处理
-    bool enableNotificaion = m_notifySettings->getAppSetting(appName, NotifySettings::ENABELNOTIFICATION).toBool();
+    bool enableNotificaion = m_notifySettings->getAppSetting(appId, NotifySettings::ENABELNOTIFICATION).toBool();
 
-    if (!enableNotificaion && !IgnoreList.contains(appName)) {
+    if (!enableNotificaion && !IgnoreList.contains(appId)) {
         return 0;
     }
 
     QString strBody = body;
     strBody.replace(QLatin1String("\\\\"), QLatin1String("\\"), Qt::CaseInsensitive);
+    QString icon = appIcon;
+    if (icon.isEmpty())
+        icon = m_notifySettings->getAppSetting(appId, NotifySettings::APPICON).toString();
 
-    EntityPtr notification = std::make_shared<NotificationEntity>(appName, QString(), appIcon,
+    EntityPtr notification = std::make_shared<NotificationEntity>(appName, QString(), icon,
                                                                   summary, strBody, actions, hints,
                                                                   QString::number(QDateTime::currentMSecsSinceEpoch()),
                                                                   QString::number(replacesId),
@@ -203,10 +223,10 @@ uint BubbleManager::Notify(const QString &appName, uint replacesId,
     bool lockscree = m_userInter->locked();
 
     if (!systemNotification) {
-        enablePreview = m_notifySettings->getAppSetting(appName, NotifySettings::ENABELPREVIEW).toBool();
-        showInNotifyCenter = m_notifySettings->getAppSetting(appName, NotifySettings::SHOWINNOTIFICATIONCENTER).toBool();
-        playsound = m_notifySettings->getAppSetting(appName, NotifySettings::ENABELSOUND).toBool();
-        lockscreeshow = m_notifySettings->getAppSetting(appName, NotifySettings::LOCKSCREENSHOWNOTIFICATION).toBool();
+        enablePreview = m_notifySettings->getAppSetting(appId, NotifySettings::ENABELPREVIEW).toBool();
+        showInNotifyCenter = m_notifySettings->getAppSetting(appId, NotifySettings::SHOWINNOTIFICATIONCENTER).toBool();
+        playsound = m_notifySettings->getAppSetting(appId, NotifySettings::ENABELSOUND).toBool();
+        lockscreeshow = m_notifySettings->getAppSetting(appId, NotifySettings::LOCKSCREENSHOWNOTIFICATION).toBool();
     }
 
     notification->setShowPreview(enablePreview);

dde-osd/src/notification/notifysettings.cpp

@@ -5,7 +5,6 @@
 #include "notifysettings.h"
 #include "constants.h"
 #include "types/objectmanager_type.h"
-#include "types/launcheriteminfo.h"
 #include <DUtil>
 
 #include <QGSettings>
@@ -66,20 +65,32 @@ static LauncherItemInfo fromObjectInterfaceMapToItemInfo(const QDBusObjectPath &
         }
 
         info.icon = icon;
+        auto genericNameMap = qdbus_cast<QMap<QString, QString>>(mapInter["GenericName"]);
         auto nameMap = qdbus_cast<QMap<QString, QString>>(mapInter["Name"]);
         QString id = qdbus_cast<QString>(mapInter["ID"]);
         info.id = id;
 
-        QString showName = id;
-
-        for (auto &lang : uiLanguages) {
-            auto iter = nameMap.find(lang);
-            if (iter != nameMap.end()) {
-                showName = iter.value();
-                break;
+        auto findName = [uiLanguages](QMap<QString, QString> &nmap){
+            QString name;
+            for (auto &lang : uiLanguages) {
+                auto iter = nmap.find(lang);
+                if (iter != nmap.end()) {
+                    name = iter.value();
+                    break;
+                }
             }
-        }
+            return name;
+        };
+
+        QString showName = findName(genericNameMap);
+        if (showName.isEmpty())
+            showName = findName(nameMap);
+
+        if (showName.isEmpty())
+            showName = id;
+
         info.name = showName;
+        info.names = nameMap.values() + genericNameMap.values();
     }
     return info;
 
@@ -122,10 +133,16 @@ NotifySettings::NotifySettings(QObject *parent)
         appAdded(info);
     });
     connect(m_applicationObjectInter, &ApplicationObjectManager1::InterfacesRemoved, this, [this](const QDBusObjectPath &object_path, const QStringList) {
-        QString id_origin = object_path.path().split("/").last();
+        QString path = object_path.path();
+        QString id_origin = path.split("/").last();
         QString id = DUtil::unescapeFromObjectPath(id_origin);
         qCInfo(SessionNotifySettings) << "Interface removed, removed id=" << id;
         appRemoved(id);
+
+        LauncherItemInfo info;
+        info.path = path;
+        if (m_launcherItemInfoList.contains(info))
+            m_launcherItemInfoList.removeOne(info);
     });
 }
 
@@ -135,12 +152,12 @@ void NotifySettings::initAllSettings()
     if (app_map.isEmpty()) {
         m_initTimer->stop();
     }
-    LauncherItemInfoList itemInfoList = fromObjectMaptoLauncherItemInfoList(app_map);
+    m_launcherItemInfoList = fromObjectMaptoLauncherItemInfoList(app_map);
 
     QStringList appList = m_systemSetting->get("app-list").toStringList();
     QStringList launcherList;
 
-    for(const LauncherItemInfo &item: itemInfoList) {
+    for(const LauncherItemInfo &item : m_launcherItemInfoList) {
         if (IgnoreList.contains(item.id)) {
             continue;
         }
@@ -155,6 +172,8 @@ void NotifySettings::initAllSettings()
             // 修改系统语言后需要更新翻译
             QGSettings itemSetting(appSchemaKey.toLocal8Bit(), appSchemaPath.arg(item.id).toLocal8Bit(), this);
             itemSetting.set("app-name", item.name);
+            // icon 也可能会更新
+            itemSetting.set("app-icon", item.icon);
             continue;
         }
         appList.append(item.id);
@@ -211,7 +230,22 @@ void NotifySettings::setAppSetting(const QString &id, const NotifySettings::AppC
 
 QVariant NotifySettings::getAppSetting(const QString &id, const NotifySettings::AppConfigurationItem &item)
 {
-    const QString newid = id.isEmpty() ? "empty-app" : id;
+    QString newid = id.isEmpty() ? "empty-app" : id;
+
+    auto it = std::find_if(m_launcherItemInfoList.begin(),
+                           m_launcherItemInfoList.end(),
+                           [newid](const LauncherItemInfo &info) {
+                               return newid == info.id;
+                           });
+    if (it == m_launcherItemInfoList.end()) {
+        for (auto info : m_launcherItemInfoList) {
+            if (info.names.contains(newid) && info.id != newid) {
+                qDebug() << newid << "not found,fallback to" << info.id;
+                newid = info.id;
+            }
+        }
+    }
+
     QGSettings itemSetting(appSchemaKey.toLocal8Bit(), appSchemaPath.arg(newid).toLocal8Bit(), this);
 
     QVariant results;
@@ -243,6 +277,7 @@ QVariant NotifySettings::getAppSetting(const QString &id, const NotifySettings::
             break;
         }
     }
+
     return results;
 }
 
@@ -323,6 +358,9 @@ void NotifySettings::appAdded(const LauncherItemInfo &info)
         itemSetting.set("show-in-notification-center", DEFAULT_ONLY_IN_NOTIFY);
         itemSetting.set("lockscreen-show-notification", DEFAULT_LOCK_SHOW_NOTIFY);
     }
+    if (!m_launcherItemInfoList.contains(info)) {
+        m_launcherItemInfoList << info;
+    }
 
     Q_EMIT appAddedSignal(info.id);
 }

dde-osd/src/notification/notifysettings.h

@@ -92,6 +92,7 @@ class NotifySettings : public AbstractNotifySetting
     QTimer *m_initTimer;
     QGSettings *m_systemSetting;
     ApplicationObjectManager1 *m_applicationObjectInter;
+    LauncherItemInfoList m_launcherItemInfoList;
 };
 
 #endif // NOTIFYSETTINGS_H

debian/changelog

@@ -1,3 +1,9 @@
+dde-session-ui (6.0.19) unstable; urgency=medium
+
+  * release 6.0.19
+
+ -- Mike Chen <chenke@deepin.org>  Thu, 23 May 2024 14:11:46 +0800
+
 dde-session-ui (6.0.18) unstable; urgency=medium
 
   * fix: wrong position of notification

global_util/dbus/types/launcheriteminfo.cpp

@@ -22,5 +22,10 @@
 
 bool LauncherItemInfo::operator!=(const LauncherItemInfo &itemInfo)
 {
-    return itemInfo.path != path;
+    return !operator==(itemInfo);
+}
+
+bool LauncherItemInfo::operator==(const LauncherItemInfo &itemInfo)
+{
+    return itemInfo.path == path;
 }

global_util/dbus/types/launcheriteminfo.h

@@ -32,12 +32,14 @@ struct LauncherItemInfo {
     qint64 categoryId;
     qint64 timeInstalled;
     QStringList keywords;
+    QStringList names;
     bool noDisplay;
     bool operator!=(const LauncherItemInfo &versionInfo);
+    bool operator==(const LauncherItemInfo &versionInfo);
 
     friend QDebug operator<<(QDebug argument, const LauncherItemInfo &info)
     {
-        argument << info.path << info.name << info.id;
+        argument << info.path << info.names << info.id;
         argument << info.icon << info.categoryId << info.timeInstalled << info.keywords << info.noDisplay;
 
         return argument;