blumia/dde-application-manager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refact: refactor method Identify and improve unit test

Browse Source 
Signed-off-by: ComixHe <heyuming@deepin.org>
This commit is contained in:
ComixHe
2023-09-14 13:38:44 +08:00
committed by Comix
parent bc7fbfb3a1
commit ebb5f613c4
8 changed files with 90 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/dbus/applicationmanager1service.cpp
View File

@ -14,10 +14,13 @@
ApplicationManager1Service::~ApplicationManager1Service() = default;
ApplicationManager1Service::ApplicationManager1Service(std::unique_ptr<Identifier> ptr,
QDBusConnection &connection,
std::weak_ptr<ApplicationManager1Storage> storage) noexcept
: m_identifier(std::move(ptr))
, m_storage(std::move(storage))
{
}
void ApplicationManager1Service::initService(QDBusConnection &connection) noexcept
{
if (!connection.registerService(DDEApplicationManager1ServiceName)) {
qFatal("%s", connection.lastError().message().toLocal8Bit().data());
@ -314,8 +317,7 @@ void ApplicationManager1Service::removeAllApplication() noexcept
}
QString ApplicationManager1Service::Identify(const QDBusUnixFileDescriptor &pidfd,
QDBusObjectPath &application,
QDBusObjectPath &application_instance)
ObjectMap &application_instance_info) const noexcept
{
if (!pidfd.isValid()) {
qWarning() << "pidfd isn't a valid unix file descriptor";
@ -353,15 +355,32 @@ QString ApplicationManager1Service::Identify(const QDBusUnixFileDescriptor &pidf
const auto ret = m_identifier->Identify(pid);
if (ret.ApplicationId.isEmpty()) {
qInfo() << "Identify failed.";
return {};
}
auto app = std::find_if(m_applicationList.cbegin(), m_applicationList.cend(), [&ret](const auto &appPtr) {
return appPtr->id() == ret.ApplicationId;
});
if (app == m_applicationList.cend()) {
qWarning() << "can't find application:" << ret.ApplicationId;
return {};
}
application = m_applicationList.key(*app);
application_instance = (*app)->findInstance(ret.InstanceId);
auto instance = (*app)->findInstance(ret.InstanceId);
if (auto path = instance.path(); path.isEmpty()) {
qWarning() << "can't find instance:" << path;
return {};
}
auto instanceObj = (*app)->m_Instances.constFind(instance);
auto map = getChildInterfacesAndPropertiesFromObject(instanceObj->get());
application_instance_info.insert(instance, map);
return ret.ApplicationId;
}

4
src/dbus/applicationmanager1service.h
View File

@ -24,7 +24,6 @@ class ApplicationManager1Service final : public QObject
Q_OBJECT
public:
explicit ApplicationManager1Service(std::unique_ptr<Identifier> ptr,
QDBusConnection &connection,
std::weak_ptr<ApplicationManager1Storage> storage) noexcept;
~ApplicationManager1Service() override;
ApplicationManager1Service(const ApplicationManager1Service &) = delete;
@ -35,6 +34,7 @@ public:
Q_PROPERTY(QList<QDBusObjectPath> List READ list NOTIFY listChanged)
[[nodiscard]] QList<QDBusObjectPath> list() const;
void initService(QDBusConnection &connection) noexcept;
bool addApplication(DesktopFile desktopFileSource) noexcept;
void removeOneApplication(const QDBusObjectPath &application) noexcept;
void removeAllApplication() noexcept;
@ -44,7 +44,7 @@ public:
JobManager1Service &jobManager() noexcept { return *m_jobManager; }
public Q_SLOTS:
QString Identify(const QDBusUnixFileDescriptor &pidfd, QDBusObjectPath &application, QDBusObjectPath &application_instance);
QString Identify(const QDBusUnixFileDescriptor &pidfd, ObjectMap &application_instance_info) const noexcept;
void ReloadApplications();
[[nodiscard]] ObjectMap GetManagedObjects() const;