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

chore: V23接口改造适配

Browse Source 
V23接口改造适配

Log: V23接口改造适配
Influence: 无
Task: https://pms.uniontech.com/task-view-207483.html
Change-Id: I91e7c2807c168e87781e18aedc7aec887702ae13
This commit is contained in:
tanfeng
2022-11-17 17:25:20 +08:00
committed by fanpengcheng
parent d1fe32c13e
commit e4f4a47b87
42 changed files with 147 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/service/CMakeLists.txt
View File

@ -12,22 +12,22 @@ pkg_check_modules(GLib REQUIRED IMPORTED_TARGET glib-2.0)
pkg_check_modules(QGSettings REQUIRED IMPORTED_TARGET gsettings-qt)
qt5_add_dbus_adaptor(ADAPTER_SOURCES
../../dbus/org.desktopspec.ApplicationManager.xml
../../dbus/org.deepin.dde.Application1.Manager.xml
impl/application_manager.h
ApplicationManager)
qt5_add_dbus_adaptor(ADAPTER_SOURCES
../../dbus/org.desktopspec.Application.xml
../../dbus/org.deepin.dde.Application1.xml
impl/application.h
Application)
qt5_add_dbus_adaptor(ADAPTER_SOURCES
../../dbus/org.desktopspec.ApplicationInstance.xml
../../dbus/org.deepin.dde.Application1.Instance.xml
impl/application_instance.h
ApplicationInstance)
qt5_add_dbus_adaptor(ADAPTER_SOURCES
../../dbus/org.deepin.daemon.Mime.xml
../../dbus/org.deepin.dde.Mime1.xml
../modules/mimeapp/mime_app.h
MimeApp)

2
src/service/impl/application.cpp
View File

@ -124,7 +124,7 @@ QString Application::Name(const QString &locale)
QDBusObjectPath Application::path() const
{
return QDBusObjectPath(QString("/org/desktopspec/Application/%1").arg(QString(QCryptographicHash::hash(id().toUtf8(), QCryptographicHash::Md5).toHex())));
return QDBusObjectPath(QString("/org/deepin/dde/Application1/%1").arg(QString(QCryptographicHash::hash(id().toUtf8(), QCryptographicHash::Md5).toHex())));
}
Application::Type Application::type() const

18
src/service/impl/application_instance.cpp
View File

@ -1,7 +1,7 @@
#include "application_instance.h"
#include "../applicationhelper.h"
#include "application.h"
#include "applicationinstanceadaptor.h"
#include "instanceadaptor.h"
#include <qdatetime.h>
#include <QCryptographicHash>
@ -21,7 +21,7 @@ class ApplicationInstancePrivate
Q_DECLARE_PUBLIC(ApplicationInstance);
Application* application;
ApplicationInstanceAdaptor* adapter;
InstanceAdaptor* adapter;
QString m_path;
QSharedPointer<modules::ApplicationHelper::Helper> helper;
QDateTime startupTime;
@ -33,8 +33,8 @@ public:
{
startupTime = QDateTime::currentDateTime();
m_id = QString(QCryptographicHash::hash(QUuid::createUuid().toByteArray(), QCryptographicHash::Md5).toHex());
m_path = QString("/org/desktopspec/ApplicationInstance/%1").arg(m_id);
adapter = new ApplicationInstanceAdaptor(q_ptr);
m_path = QString("/org/deepin/dde/Application1/Instance/%1").arg(m_id);
adapter = new InstanceAdaptor(q_ptr);
}
~ApplicationInstancePrivate()
@ -70,9 +70,9 @@ public:
Q_EMIT q_ptr->taskFinished(p->exitCode());
}
#else
qInfo() << "app manager load service:" << QString("org.desktopspec.application.instance@%1.service").arg(m_id);
qInfo() << "app manager load service:" << QString("org.deepin.dde.Application1.Instance@%1.service").arg(m_id);
QDBusInterface systemd("org.freedesktop.systemd1", "/org/freedesktop/systemd1", "org.freedesktop.systemd1.Manager");
QDBusReply<void> reply = systemd.call("StartUnit", QString("org.desktopspec.application.instance@%1.service").arg(m_id), "replace-irreversibly");
QDBusReply<void> reply = systemd.call("StartUnit", QString("org.deepin.dde.Application1.Instance@%1.service").arg(m_id), "replace-irreversibly");
if (!reply.isValid()) {
qInfo() << reply.error();
q_ptr->deleteLater();
@ -85,7 +85,7 @@ public:
#ifdef LOADER_PATH
#else
QDBusInterface systemd("org.freedesktop.systemd1", "/org/freedesktop/systemd1", "org.freedesktop.systemd1.Manager");
qInfo() << systemd.call("StopUnit", QString("org.desktopspec.application.instance@%1.service").arg(m_id), "replace-irreversibly");
qInfo() << systemd.call("StopUnit", QString("org.deepin.dde.Application1.Instance@%1.service").arg(m_id), "replace-irreversibly");
#endif
}
@ -112,7 +112,7 @@ ApplicationInstance::ApplicationInstance(Application* parent, QSharedPointer<mod
d->helper = helper;
QTimer::singleShot(0, this, [ = ] {
QDBusConnection::sessionBus().registerObject(d->m_path, "org.desktopspec.ApplicationInstance", this);
QDBusConnection::sessionBus().registerObject(d->m_path, "org.deepin.dde.Application1.Instance", this);
d->run();
});
}
@ -196,6 +196,6 @@ uint32_t ApplicationInstance::getPid()
void ApplicationInstance::Success(const QString& data)
{
Q_D(ApplicationInstance);
QDBusConnection::sessionBus().registerObject(d->m_path, "org.desktopspec.ApplicationInstance", this);
QDBusConnection::sessionBus().registerObject(d->m_path, "org.deepin.dde.Application1.Instance", this);
return d->_success(data);
}

2
src/service/impl/application_manager.cpp
View File

@ -21,7 +21,7 @@
#include "../../modules/startmanager/startmanager.h"
#include "application.h"
#include "application_instance.h"
#include "applicationinstanceadaptor.h"
#include "instanceadaptor.h"
#include "../lib/keyfile.h"
ApplicationManagerPrivate::ApplicationManagerPrivate(ApplicationManager* parent)

28
src/service/main.cpp
View File

@ -2,10 +2,10 @@
#include "impl/application_manager.h"
#include "impl/application.h"
#include "applicationmanageradaptor.h"
#include "applicationadaptor.h"
#include "manageradaptor.h"
#include "application1adaptor.h"
#include "applicationhelper.h"
#include "mimeadaptor.h"
#include "mime1adaptor.h"
#include "../modules/apps/appmanager.h"
#include "../modules/launcher/launchermanager.h"
#include "../modules/dock/dockmanager.h"
@ -18,9 +18,9 @@
DCORE_USE_NAMESPACE
#define ApplicationManagerServiceName "org.desktopspec.ApplicationManager"
#define ApplicationManagerServicePath "/org/desktopspec/ApplicationManager"
#define ApplicationManagerInterface "org.desktopspec.ApplicationManager"
#define ApplicationManagerServiceName "org.deepin.dde.Application1.Manager"
#define ApplicationManagerServicePath "/org/deepin/dde/Application1/Manager"
#define ApplicationManagerInterface "org.deepin.dde.Application1.Manager"
QFileInfoList scan(const QString &path)
{
@ -85,10 +85,10 @@ int main(int argc, char *argv[])
new AppManager(ApplicationManager::instance());
new LauncherManager(ApplicationManager::instance());
new DockManager(ApplicationManager::instance());
new ApplicationManagerAdaptor(ApplicationManager::instance());
new ManagerAdaptor(ApplicationManager::instance());
QDBusConnection connection = QDBusConnection::sessionBus();
if (!connection.registerService("org.desktopspec.Application")) {
if (!connection.registerService("org.deepin.dde.Application1")) {
qWarning() << "error: " << connection.lastError().message();
return -1;
}
@ -104,11 +104,11 @@ int main(int argc, char *argv[])
}
QList<QSharedPointer<Application>> apps{ scanFiles() };
QList<QSharedPointer<ApplicationAdaptor>> appAdapters;
QList<QSharedPointer<Application1Adaptor>> appAdapters;
for (const QSharedPointer<Application> app : apps) {
QSharedPointer<ApplicationAdaptor> adapter = QSharedPointer<ApplicationAdaptor>(new ApplicationAdaptor(app.get()));
QSharedPointer<Application1Adaptor> adapter = QSharedPointer<Application1Adaptor>(new Application1Adaptor(app.get()));
appAdapters << adapter;
if (!connection.registerObject(app->path().path(), "org.desktopspec.Application", app.get())) {
if (!connection.registerObject(app->path().path(), "org.deepin.dde.Application1", app.get())) {
qWarning() << "error: " << connection.lastError().message();
continue;
}
@ -120,13 +120,13 @@ int main(int argc, char *argv[])
MimeApp* mimeApp = new MimeApp;
new MimeAdaptor(mimeApp);
if (!connection.registerService("org.deepin.daemon.Mime1")) {
new Mime1Adaptor(mimeApp);
if (!connection.registerService("org.deepin.dde.Mime1")) {
qWarning() << "error: " << connection.lastError().message();
return -1;
}
if (!connection.registerObject("/org/deepin/daemon/Mime1", "org.deepin.daemon.Mime1", mimeApp)) {
if (!connection.registerObject("/org/deepin/dde/Mime1", "org.deepin.dde.Mime1", mimeApp)) {
qWarning() << "error: " << connection.lastError().message();
return -1;
}