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

feat: add impl of updateApplicationInfo

Browse Source 
1. change the way to traverse files
2. refact some code

Signed-off-by: ComixHe <heyuming@deepin.org>
Signed-off-by: black-desk <me@black-desk.cn>
This commit is contained in:
ComixHe
2023-08-10 14:32:09 +08:00
committed by Comix
parent 799100436c
commit 722d0666d3
15 changed files with 307 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

114
src/dbus/applicationmanager1service.cpp
View File

@ -3,6 +3,7 @@
// SPDX-License-Identifier: LGPL-3.0-or-later
#include "dbus/applicationmanager1service.h"
#include "dbus/applicationmanager1adaptor.h"
#include "systemdsignaldispatcher.h"
#include <QFile>
#include <unistd.h>
@ -28,7 +29,7 @@ ApplicationManager1Service::ApplicationManager1Service(std::unique_ptr<Identifie
connect(&dispatcher,
&SystemdSignalDispatcher::SystemdUnitNew,
this,
[this](QString serviceName, QDBusObjectPath systemdUnitPath) {
[this](const QString &serviceName, const QDBusObjectPath &systemdUnitPath) {
auto [appId, instanceId] = processServiceName(serviceName);
if (appId.isEmpty()) {
return;
@ -50,21 +51,17 @@ ApplicationManager1Service::ApplicationManager1Service(std::unique_ptr<Identifie
connect(&dispatcher,
&SystemdSignalDispatcher::SystemdUnitRemoved,
this,
[this](QString serviceName, QDBusObjectPath systemdUnitPath) {
[this](const QString &serviceName, QDBusObjectPath systemdUnitPath) {
auto pair = processServiceName(serviceName);
auto appId = pair.first, instanceId = pair.second;
auto appId = pair.first;
auto instanceId = pair.second;
if (appId.isEmpty()) {
return;
}
auto appIt = std::find_if(m_applicationList.cbegin(),
m_applicationList.cend(),
[&appId](const QSharedPointer<ApplicationService> &app) {
if (app->id() == appId) {
return true;
}
return false;
});
[&appId](const QSharedPointer<ApplicationService> &app) { return app->id() == appId; });
if (appIt == m_applicationList.cend()) [[unlikely]] {
qWarning() << "couldn't find app" << appId << "in application manager.";
@ -76,10 +73,7 @@ ApplicationManager1Service::ApplicationManager1Service(std::unique_ptr<Identifie
auto instanceIt = std::find_if(appRef->m_Instances.cbegin(),
appRef->m_Instances.cend(),
[&systemdUnitPath](const QSharedPointer<InstanceService> &value) {
if (value->systemdUnitPath() == systemdUnitPath) {
return true;
}
return false;
return value->systemdUnitPath() == systemdUnitPath;
});
if (instanceIt != appRef->m_Instances.cend()) [[likely]] {
@ -88,7 +82,7 @@ ApplicationManager1Service::ApplicationManager1Service(std::unique_ptr<Identifie
});
}
QPair<QString, QString> ApplicationManager1Service::processServiceName(const QString &serviceName)
QPair<QString, QString> ApplicationManager1Service::processServiceName(const QString &serviceName) noexcept
{
QString instanceId;
QString applicationId;
@ -128,23 +122,23 @@ QList<QDBusObjectPath> ApplicationManager1Service::list() const
return m_applicationList.keys();
}
bool ApplicationManager1Service::removeOneApplication(const QDBusObjectPath &application)
void ApplicationManager1Service::removeOneApplication(const QDBusObjectPath &application)
{
return m_applicationList.remove(application) != 0;
unregisterObjectFromDBus(application.path());
m_applicationList.remove(application);
}
void ApplicationManager1Service::removeAllApplication()
{
m_applicationList.clear();
for (const auto &app : m_applicationList.keys()) {
removeOneApplication(app);
}
}
QDBusObjectPath ApplicationManager1Service::Application(const QString &id) const
{
auto ret = std::find_if(m_applicationList.cbegin(), m_applicationList.cend(), [&id](const auto &app) {
if (app->id() == id) {
return true;
}
return false;
return static_cast<bool>(app->id() == id);
});
if (ret != m_applicationList.cend()) {
@ -219,4 +213,80 @@ QDBusObjectPath ApplicationManager1Service::Launch(const QString &id,
return value->Launch(actions, fields, options);
}
void ApplicationManager1Service::UpdateApplicationInfo(const QStringList &update_path) {}
void ApplicationManager1Service::UpdateApplicationInfo(const QStringList &app_id)
{
auto XDGDataDirs = QString::fromLocal8Bit(qgetenv("XDG_DATA_DIRS")).split(':', Qt::SkipEmptyParts);
std::for_each(XDGDataDirs.begin(), XDGDataDirs.end(), [](QString &str) {
if (!str.endsWith(QDir::separator())) {
str.append(QDir::separator());
}
str.append("applications");
});
for (auto id : app_id) {
auto destApp = std::find_if(m_applicationList.begin(),
m_applicationList.end(),
[&id](const QSharedPointer<ApplicationService> &value) { return value->id() == id; });
if (destApp == m_applicationList.end()) { // new app
qInfo() << "add a new application:" << id;
do {
for (const auto &suffix : XDGDataDirs) {
QFileInfo info{suffix + id};
if (info.exists()) {
ParseError err;
auto file = DesktopFile::searchDesktopFile(info.absoluteFilePath(), err);
if (!file.has_value()) {
continue;
}
if (!addApplication(std::move(file).value())) {
id.clear();
break;
}
}
}
if (id.isEmpty()) {
break;
}
auto hyphenIndex = id.indexOf('-');
if (hyphenIndex == -1) {
break;
}
id[hyphenIndex] = QDir::separator();
} while (true);
} else { // remove or update
if (!(*destApp)->m_isPersistence) [[unlikely]] {
continue;
}
auto filePath = (*destApp)->m_desktopSource.m_file.filePath();
if (QFileInfo::exists(filePath)) { // update
qInfo() << "update application:" << id;
struct stat buf;
if (auto ret = stat(filePath.toLatin1().data(), &buf); ret == -1) {
qWarning() << "get file" << filePath << "state failed:" << std::strerror(errno) << ", skip...";
continue;
}
if ((*destApp)->m_desktopSource.m_file.modified(
static_cast<std::size_t>(buf.st_mtim.tv_sec * 1e9 + buf.st_mtim.tv_nsec))) {
auto newEntry = new DesktopEntry{};
auto err = newEntry->parse((*destApp)->m_desktopSource.m_file);
if (err != ParseError::NoError and err != ParseError::EntryKeyInvalid) {
qWarning() << "update desktop file failed:" << err << ", content wouldn't change.";
continue;
}
(*destApp)->m_entry.reset(newEntry);
}
} else { // remove
qInfo() << "remove application:" << id;
removeOneApplication((*destApp)->m_applicationPath);
}
}
}
}

10
src/dbus/applicationmanager1service.h
View File

@ -29,7 +29,7 @@ public:
ApplicationManager1Service &operator=(ApplicationManager1Service &&) = delete;
Q_PROPERTY(QList<QDBusObjectPath> List READ list)
QList<QDBusObjectPath> list() const;
[[nodiscard]] QList<QDBusObjectPath> list() const;
template <typename T>
bool addApplication(T &&desktopFileSource)
{
@ -45,23 +45,23 @@ public:
m_applicationList.insert(application->m_applicationPath, application);
return true;
}
bool removeOneApplication(const QDBusObjectPath &application);
void removeOneApplication(const QDBusObjectPath &application);
void removeAllApplication();
JobManager1Service &jobManager() noexcept { return *m_jobManager; }
public Q_SLOTS:
QDBusObjectPath Application(const QString &id) const;
[[nodiscard]] QDBusObjectPath Application(const QString &id) const;
QString Identify(const QDBusUnixFileDescriptor &pidfd, QDBusObjectPath &application, QDBusObjectPath &application_instance);
QDBusObjectPath Launch(const QString &id, const QString &action, const QStringList &fields, const QVariantMap &options);
void UpdateApplicationInfo(const QStringList &update_path);
void UpdateApplicationInfo(const QStringList &app_id);
private:
std::unique_ptr<Identifier> m_identifier;
QScopedPointer<JobManager1Service> m_jobManager{nullptr};
QMap<QDBusObjectPath, QSharedPointer<ApplicationService>> m_applicationList;
QPair<QString, QString> processServiceName(const QString &serviceName);
static QPair<QString, QString> processServiceName(const QString &serviceName) noexcept;
};
#endif

4
src/dbus/applicationservice.cpp
View File

@ -17,6 +17,10 @@
ApplicationService::~ApplicationService()
{
m_desktopSource.destruct(m_isPersistence);
for (auto &instance : m_Instances.values()) {
instance->m_Application = QDBusObjectPath{"/"};
instance->setParent(qApp); // detach all instances to qApp
}
}
qsizetype ApplicationService::applicationCheck(const QString &serviceName)

15
src/dbus/applicationservice.h
View File

@ -18,7 +18,6 @@
#include "global.h"
#include "desktopentry.h"
#include "desktopicons.h"
#include "systemdsignaldispatcher.h"
#include "dbus/jobmanager1service.h"
class ApplicationService : public QObject
@ -32,25 +31,25 @@ public:
ApplicationService &operator=(ApplicationService &&) = delete;
Q_PROPERTY(QStringList Actions READ actions CONSTANT)
QStringList actions() const noexcept;
[[nodiscard]] QStringList actions() const noexcept;
Q_PROPERTY(QString ID READ id CONSTANT)
QString id() const noexcept;
[[nodiscard]] QString id() const noexcept;
Q_PROPERTY(IconMap Icons READ icons)
IconMap icons() const;
[[nodiscard]] IconMap icons() const;
IconMap &iconsRef();
Q_PROPERTY(bool AutoStart READ isAutoStart WRITE setAutoStart)
bool isAutoStart() const noexcept;
[[nodiscard]] bool isAutoStart() const noexcept;
void setAutoStart(bool autostart) noexcept;
Q_PROPERTY(QList<QDBusObjectPath> Instances READ instances)
QList<QDBusObjectPath> instances() const noexcept;
[[nodiscard]] QList<QDBusObjectPath> instances() const noexcept;
QDBusObjectPath findInstance(const QString &instanceId) const;
[[nodiscard]] QDBusObjectPath findInstance(const QString &instanceId) const;
const QString &getLauncher() const noexcept { return m_launcher; }
[[nodiscard]] const QString &getLauncher() const noexcept { return m_launcher; }
void setLauncher(const QString &launcher) noexcept { m_launcher = launcher; }
bool addOneInstance(const QString &instanceId, const QString &application, const QString &systemdUnitPath);

10
src/dbus/instanceservice.h
View File

@ -19,19 +19,19 @@ public:
InstanceService &operator=(InstanceService &&) = delete;
Q_PROPERTY(QDBusObjectPath Application READ application)
QDBusObjectPath application() const;
[[nodiscard]] QDBusObjectPath application() const;
Q_PROPERTY(QDBusObjectPath SystemdUnitPath READ systemdUnitPath)
QDBusObjectPath systemdUnitPath() const;
[[nodiscard]] QDBusObjectPath systemdUnitPath() const;
const QString &instanceId() const noexcept { return m_instanceId; }
[[nodiscard]] const QString &instanceId() const noexcept { return m_instanceId; }
private:
friend class ApplicationService;
InstanceService(QString instanceId, QString application, QString systemdUnitPath);
QString m_instanceId;
const QDBusObjectPath m_Application;
const QDBusObjectPath m_SystemdUnitPath;
QDBusObjectPath m_Application;
QDBusObjectPath m_SystemdUnitPath;
};
#endif

6
src/dbus/jobmanager1service.h
View File

@ -46,7 +46,7 @@ public:
~JobManager1Service() override;
template <typename F>
QDBusObjectPath addJob(QString source, F func, QVariantList args)
QDBusObjectPath addJob(const QString &source, F func, QVariantList args)
{
static_assert(std::is_invocable_v<F, QVariant>, "param type must be QVariant.");
@ -66,7 +66,7 @@ public:
auto path = QDBusObjectPath{objectPath};
{
QMutexLocker locker{&m_mutex};
m_jobs.insert(path, std::move(job)); // Insertion is always successful
m_jobs.insert(path, job); // Insertion is always successful
}
emit JobNew(path, QDBusObjectPath{source});
@ -97,7 +97,7 @@ Q_SIGNALS:
private:
bool removeOneJob(const QDBusObjectPath &path);
friend class ApplicationManager1Service;
JobManager1Service(ApplicationManager1Service *parent);
explicit JobManager1Service(ApplicationManager1Service *parent);
QMutex m_mutex;
QMap<QDBusObjectPath, QSharedPointer<JobService>> m_jobs;
ApplicationManager1Service *m_parent{nullptr};