diff --git a/misc/service/CMakeLists.txt b/misc/service/CMakeLists.txt index cebcc6b..883bd9f 100644 --- a/misc/service/CMakeLists.txt +++ b/misc/service/CMakeLists.txt @@ -12,4 +12,4 @@ endmacro(install_symlink) install(FILES ${SERVICE_FILES} DESTINATION lib/systemd/user/) # 添加软链接,系统启动时被dde-session-initialized拉起 -install_symlink(dde-application-manager.service dde-session-initialized.target.wants) +# install_symlink(dde-application-manager.service dde-session-initialized.target.wants) diff --git a/misc/service/dde-application-manager.service b/misc/service/dde-application-manager.service index 4c1ff74..5c60b6f 100644 --- a/misc/service/dde-application-manager.service +++ b/misc/service/dde-application-manager.service @@ -8,9 +8,7 @@ CollectMode=inactive-or-failed StartLimitIntervalSec=10s StartLimitBurst=30 -Requisite=dde-session-initialized.target -PartOf=dde-session-initialized.target -After=dde-session-initialized.target +#PartOf=dde-session-daemon.target [Service] Type=simple @@ -19,3 +17,7 @@ TimeoutStartSec=infinity Slice=components.slice Restart=on-failure RestartSec=300ms + + +#[Install] +#WantedBy=dde-session-daemon.target diff --git a/src/lib/basedir.cpp b/src/lib/basedir.cpp index 38b8881..be6109f 100644 --- a/src/lib/basedir.cpp +++ b/src/lib/basedir.cpp @@ -121,7 +121,7 @@ std::string BaseDir::userCacheDir() std::string BaseDir::userAppDir() { std::string dataDir = userDataDir(); - return (dataDir.size() > 0) ? dataDir + "appliations/" : ""; + return (dataDir.size() > 0) ? dataDir + "applications/" : ""; } std::vector BaseDir::sysAppDirs() diff --git a/src/modules/apps/appmanager.cpp b/src/modules/apps/appmanager.cpp index 8e9a607..cda5208 100644 --- a/src/modules/apps/appmanager.cpp +++ b/src/modules/apps/appmanager.cpp @@ -33,6 +33,7 @@ AppManager::AppManager(QObject *parent) , watcher(new DFWatcher(this)) , recorder(new AlRecorder(watcher, this)) { + qInfo() << "AppManager"; new DBusAdaptorRecorder(recorder); QDBusConnection con = QDBusConnection::sessionBus(); if (!con.registerService("org.deepin.daemon.AlRecorder1")) @@ -53,6 +54,7 @@ AppManager::AppManager(QObject *parent) for (auto &dir : BaseDir::sysAppDirs()) dataDirs << dir.c_str(); + qInfo() << "get dataDirs: " << dataDirs; recorder->watchDirs(dataDirs); // 监控应用desktop } diff --git a/src/modules/apps/dfwatcher.cpp b/src/modules/apps/dfwatcher.cpp index 50a8c9f..5e3a383 100644 --- a/src/modules/apps/dfwatcher.cpp +++ b/src/modules/apps/dfwatcher.cpp @@ -36,7 +36,7 @@ const QString configSuffix = ".json"; QDBusConnection con = QDBusConnection::sessionBus(); if (!con.registerService("org.deepin.daemon.DFWatcher1")) { - qInfo() << "register service app1 error:" << con.lastError().message(); + qInfo() << "register service DFWatcher error:" << con.lastError().message(); return; } diff --git a/src/modules/dock/dock.cpp b/src/modules/dock/dock.cpp index 21ee13f..a7b9625 100644 --- a/src/modules/dock/dock.cpp +++ b/src/modules/dock/dock.cpp @@ -54,6 +54,7 @@ Dock::Dock(QObject *parent) registeModule("dock"); QString sessionType {getenv("XDG_SESSION_TYPE")}; + qInfo() << "sessionType=" << sessionType; if (sessionType.contains("wayland")) { // wayland env isWayland = true; @@ -636,7 +637,7 @@ void Dock::smartHideModeTimerExpired() */ void Dock::initSettings() { - SETTING->init(); + qInfo() << "init dock settings"; forceQuitAppStatus = SETTING->getForceQuitAppMode(); connect(SETTING, &DockSettings::hideModeChanged, this, [&](HideMode mode) { this->updateHideState(false); @@ -668,7 +669,7 @@ void Dock::updateMenu() void Dock::initEntries() { initDockedApps(); - if (!isWaylandEnv()) + if (!isWayland) initClientList(); } diff --git a/src/modules/dock/dockmanager.cpp b/src/modules/dock/dockmanager.cpp index ab2f76d..88bb6da 100644 --- a/src/modules/dock/dockmanager.cpp +++ b/src/modules/dock/dockmanager.cpp @@ -30,6 +30,7 @@ DockManager::DockManager(QObject *parent) : QObject(parent) , dock(new Dock(this)) { + qInfo() << "DockManager"; adaptor = new DBusAdaptorDock(dock); QDBusConnection con = QDBusConnection::sessionBus(); if (!con.registerService(dbusService)) { diff --git a/src/modules/launcher/launcher.cpp b/src/modules/launcher/launcher.cpp index bbbc28f..9441583 100644 --- a/src/modules/launcher/launcher.cpp +++ b/src/modules/launcher/launcher.cpp @@ -69,24 +69,6 @@ Launcher::Launcher(QObject *parent) "Event", "", // TODO 修正事件参数 this, SLOT(handleFSWatcherEvents(QDBusMessage))); - // 监控应用目录 - watchDataDirs(); - // 关联org.deepin.daemon.LRecorder1接口事件ServiceRestarted - QDBusConnection::sessionBus().connect("org.deepin.daemon.AlRecorder1", - "/org/deepin/daemon/AlRecorder1", - "org.deepin.daemon.AlRecorder1", - "ServiceRestarted", - this, SLOT(handleLRecoderRestart(QDBusMessage))); - - - QDBusConnectionInterface *ifc = QDBusConnection::sessionBus().interface(); - connect(ifc, &QDBusConnectionInterface::serviceOwnerChanged, this, [ & ](const QString &name, const QString &oldOwner, const QString &newOwner) { - Q_UNUSED(name) - Q_UNUSED(oldOwner) - Q_UNUSED(newOwner) - watchDataDirs(); - }); - // 关联org.deepin.daemon.LRecorder1接口事件Launched QDBusConnection::sessionBus().connect("org.deepin.daemon.AlRecorder1", "/org/deepin/daemon/AlRecorder1", @@ -461,12 +443,6 @@ void Launcher::handleFSWatcherEvents(QDBusMessage msg) } } -void Launcher:: handleLRecoderRestart(QDBusMessage msg) -{ - Q_UNUSED(msg) - watchDataDirs(); -} - /** * @brief Launcher::initSettings 初始化启动器配置 */ @@ -882,18 +858,6 @@ Item Launcher::getItemByPath(QString itemPath) return Item(); } -/** - * @brief Launcher::watchDataDirs 监控应用数据目录 - */ -void Launcher::watchDataDirs() -{ - QStringList dataDirs; - dataDirs << QDir::homePath() + ".local/share"; - dataDirs << "/usr/local/share" << "/usr/share"; - QDBusInterface interface = QDBusInterface("org.deepin.daemon.AlRecorder1", "/org/deepin/daemon/AlRecorder1", "org.deepin.daemon.AlRecorder1"); - interface.call("WatchDirs", dataDirs); -} - void Launcher::emitItemChanged(const Item *item, QString status) { LauncherItemInfo info(item->info); diff --git a/src/modules/launcher/launcher.h b/src/modules/launcher/launcher.h index 590175d..ac8338e 100644 --- a/src/modules/launcher/launcher.h +++ b/src/modules/launcher/launcher.h @@ -117,7 +117,6 @@ Q_SIGNALS: private Q_SLOTS: void handleFSWatcherEvents(QDBusMessage msg); - void handleLRecoderRestart(QDBusMessage msg); private: void initSettings(); @@ -136,7 +135,6 @@ private: QString queryPkgName(const QString &itemID, const QString &itemPath); QString queryPkgNameWithDpkg(const QString &itemPath); Item getItemByPath(QString itemPath); - void watchDataDirs(); void emitItemChanged(const Item *item, QString status); AppType getAppType(DesktopInfo &info, const Item &item); bool doUninstall(DesktopInfo &info, const Item &item); diff --git a/src/modules/launcher/launchermanager.cpp b/src/modules/launcher/launchermanager.cpp index 5b4171b..b1ece18 100644 --- a/src/modules/launcher/launchermanager.cpp +++ b/src/modules/launcher/launchermanager.cpp @@ -27,6 +27,7 @@ LauncherManager::LauncherManager(QObject *parent) : QObject(parent) , launcher(new Launcher(this)) { + qInfo() << "LauncherManager"; new DBusAdaptorLauncher(launcher); QDBusConnection con = QDBusConnection::sessionBus(); if (!con.registerService(dbusService))