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

refact: Desktop file parsing process and Application methods to

Browse Source 
Properties

Signed-off-by: ComixHe <heyuming@deepin.org>
This commit is contained in:
ComixHe
2023-08-25 10:47:17 +08:00
committed by Comix
parent 9f2a8b6798
commit ccfb245419
11 changed files with 329 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/dbus/applicationmanager1service.cpp
View File

@ -135,7 +135,7 @@ bool ApplicationManager1Service::addApplication(DesktopFile desktopFileSource) n
return false;
}
m_applicationList.insert(application->applicationPath(), application);
emit InterfacesAdded(application->applicationPath(), getInterfacesListFromObject(ptr));
emit InterfacesAdded(application->applicationPath(), getChildInterfacesAndPropertiesFromObject(ptr));
return true;
}
@ -143,7 +143,7 @@ bool ApplicationManager1Service::addApplication(DesktopFile desktopFileSource) n
void ApplicationManager1Service::removeOneApplication(const QDBusObjectPath &application) noexcept
{
if (auto it = m_applicationList.find(application); it != m_applicationList.cend()) {
emit InterfacesRemoved(application, getInterfacesListFromObject(it->data()));
emit InterfacesRemoved(application, getChildInterfacesFromObject(it->data()));
unregisterObjectFromDBus(application.path());
m_applicationList.remove(application);
}
@ -225,7 +225,7 @@ void ApplicationManager1Service::updateApplication(const QSharedPointer<Applicat
}
auto err = newEntry->parse(destApp->desktopFileSource());
if (err != DesktopErrorCode::NoError and err != DesktopErrorCode::EntryKeyInvalid) {
if (err != DesktopErrorCode::NoError) {
qWarning() << "update desktop file failed:" << err << ", content wouldn't change.";
return;
}

2
src/dbus/applicationmanager1service.h
View File

@ -46,7 +46,7 @@ public Q_SLOTS:
[[nodiscard]] ObjectMap GetManagedObjects() const;
Q_SIGNALS:
void InterfacesAdded(const QDBusObjectPath &object_path, const QStringList &interfaces);
void InterfacesAdded(const QDBusObjectPath &object_path, const ObjectInterfaceMap &interfaces);
void InterfacesRemoved(const QDBusObjectPath &object_path, const QStringList &interfaces);
private:

163
src/dbus/applicationservice.cpp
View File

@ -63,10 +63,8 @@ QSharedPointer<ApplicationService> ApplicationService::createApplicationService(
auto error = entry->parse(sourceStream);
if (error != DesktopErrorCode::NoError) {
if (error != DesktopErrorCode::EntryKeyInvalid) {
qWarning() << "parse failed:" << error;
return nullptr;
}
qWarning() << "parse failed:" << error << app->desktopFileSource().sourcePath();
return nullptr;
}
if (auto val = entry->value(DesktopFileEntryKey, "Hidden"); val.has_value()) {
@ -89,110 +87,6 @@ QSharedPointer<ApplicationService> ApplicationService::createApplicationService(
return app;
}
QString ApplicationService::GetActionName(const QString &identifier, const QStringList &env) const
{
const auto &supportedActions = actions();
if (supportedActions.isEmpty()) {
return {};
}
if (auto index = supportedActions.indexOf(identifier); index == -1) {
qWarning() << "can't find " << identifier << " in supported actions List.";
return {};
}
const auto &actionHeader = QString{"%1%2"}.arg(DesktopFileActionKey, identifier);
const auto &actionName = m_entry->value(actionHeader, "Name");
if (!actionName) {
return {};
}
QString locale{""};
bool ok;
if (!env.isEmpty()) {
QString lcStr;
for (const auto &lc : env) {
if (lc.startsWith("LANG")) {
locale = lc.split('=').last();
}
if (lc.startsWith("LC_ALL")) {
locale = lc.split('=').last();
break;
}
}
}
QLocale lc = locale.isEmpty() ? getUserLocale() : QLocale{locale};
const auto &name = actionName->toLocaleString(lc, ok);
if (!ok) {
qWarning() << "convert to locale string failed, dest locale:" << lc;
return {};
}
return name;
}
QString ApplicationService::GetDisplayName(const QStringList &env) const
{
const auto &displayName = m_entry->value(DesktopFileEntryKey, "Name");
if (!displayName) {
return {};
}
QString locale{""};
bool ok;
if (!env.isEmpty()) {
QString lcStr;
for (const auto &lc : env) {
if (lc.startsWith("LANG")) {
locale = lc.split('=').last();
}
if (lc.startsWith("LC_ALL")) {
locale = lc.split('=').last();
break;
}
}
}
QLocale lc = locale.isEmpty() ? getUserLocale() : QLocale{locale};
const auto &name = displayName->toLocaleString(lc, ok);
if (!ok) {
qWarning() << "convert to locale string failed, dest locale:" << lc;
return {};
}
return name;
}
QString ApplicationService::GetIconName(const QString &action) const
{
std::optional<DesktopEntry::Value> iconName{std::nullopt};
if (action.isEmpty()) {
iconName = m_entry->value(DesktopFileEntryKey, "Icon");
} else {
const auto &supportedActions = actions();
if (auto index = supportedActions.indexOf(action); index == -1) {
qWarning() << "can't find " << action << " in supported actions List.";
return {};
}
const auto &actionHeader = QString{"%1%2"}.arg(DesktopFileActionKey, action);
iconName = m_entry->value(actionHeader, "Icon");
}
if (!iconName) {
return {};
}
bool ok{false};
const auto &name = iconName->toIconString(ok);
return ok ? name : "";
}
QDBusObjectPath ApplicationService::Launch(const QString &action, const QStringList &fields, const QVariantMap &options)
{
QString execStr;
@ -325,12 +219,55 @@ QStringList ApplicationService::actions() const noexcept
return {};
}
auto actionList = str.split(";");
actionList.removeAll("");
auto actionList = str.split(";", Qt::SkipEmptyParts);
return actionList;
}
PropMap ApplicationService::actionName() const noexcept
{
PropMap ret;
auto actionList = actions();
for (auto &action : actionList) {
action.prepend(DesktopFileActionKey);
auto value = m_entry->value(action, "Name");
if (!value.has_value()) {
continue;
}
ret.insert(action, {std::move(value).value()});
}
return ret;
}
PropMap ApplicationService::displayName() const noexcept
{
PropMap ret;
auto value = std::move(m_entry->value(DesktopFileEntryKey, "Name")).value();
ret.insert(QString{"Name"}, {std::move(value)});
return ret;
}
PropMap ApplicationService::iconName() const noexcept
{
PropMap ret;
auto actionList = actions();
for (const auto &action : actionList) {
auto value = m_entry->value(QString{action}.prepend(DesktopFileActionKey), "Icon");
if (!value.has_value()) {
continue;
}
ret.insert(action, {std::move(value).value()});
}
auto mainIcon = m_entry->value(DesktopFileEntryKey, "Icon");
if (mainIcon.has_value()) {
ret.insert(defaultKeyStr, {std::move(mainIcon).value()});
}
return ret;
}
ObjectMap ApplicationService::GetManagedObjects() const
{
return dumpDBusObject(m_Instances);
@ -384,7 +321,7 @@ bool ApplicationService::addOneInstance(const QString &instanceId, const QString
m_Instances.insert(QDBusObjectPath{objectPath}, QSharedPointer<InstanceService>{service});
service->moveToThread(this->thread());
adaptor->moveToThread(this->thread());
emit InterfacesAdded(QDBusObjectPath{objectPath}, getInterfacesListFromObject(service));
emit InterfacesAdded(QDBusObjectPath{objectPath}, getChildInterfacesAndPropertiesFromObject(service));
return true;
}
@ -396,7 +333,7 @@ bool ApplicationService::addOneInstance(const QString &instanceId, const QString
void ApplicationService::removeOneInstance(const QDBusObjectPath &instance) noexcept
{
if (auto it = m_Instances.find(instance); it != m_Instances.cend()) {
emit InterfacesRemoved(instance, getInterfacesListFromObject(it->data()));
emit InterfacesRemoved(instance, getChildInterfacesFromObject(it->data()));
unregisterObjectFromDBus(instance.path());
m_Instances.remove(instance);
}

14
src/dbus/applicationservice.h
View File

@ -36,9 +36,18 @@ public:
Q_PROPERTY(QStringList Actions READ actions)
[[nodiscard]] QStringList actions() const noexcept;
Q_PROPERTY(PropMap ActionName READ actionName)
[[nodiscard]] PropMap actionName() const noexcept;
Q_PROPERTY(QString ID READ id CONSTANT)
[[nodiscard]] QString id() const noexcept;
Q_PROPERTY(PropMap DisplayName READ displayName)
[[nodiscard]] PropMap displayName() const noexcept;
Q_PROPERTY(PropMap IconName READ iconName)
[[nodiscard]] PropMap iconName() const noexcept;
Q_PROPERTY(qulonglong LastLaunchedTime READ lastLaunchedTime)
[[nodiscard]] qulonglong lastLaunchedTime() const noexcept;
@ -71,14 +80,11 @@ public:
void resetEntry(DesktopEntry *newEntry) noexcept;
public Q_SLOTS:
[[nodiscard]] QString GetActionName(const QString &identifier, const QStringList &env) const;
QDBusObjectPath Launch(const QString &action, const QStringList &fields, const QVariantMap &options);
[[nodiscard]] QString GetIconName(const QString &action) const;
[[nodiscard]] QString GetDisplayName(const QStringList &env) const;
[[nodiscard]] ObjectMap GetManagedObjects() const;
Q_SIGNALS:
void InterfacesAdded(const QDBusObjectPath &object_path, const QStringList &interfaces);
void InterfacesAdded(const QDBusObjectPath &object_path, const ObjectInterfaceMap &interfaces);
void InterfacesRemoved(const QDBusObjectPath &object_path, const QStringList &interfaces);
private: