Skip to content

fix(watch): fix path format and add watch for newly created directories #331

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
deepin-bot merged 1 commit into from
Feb 10, 2026
Merged

fix(watch): fix path format and add watch for newly created directories #331

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 27 additions & 2 deletions src/dbus/applicationmanager1service.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,19 @@ void ApplicationManager1Service::initService(QDBusConnection &connection) noexce
}

connect(&m_watcher, &QFileSystemWatcher::directoryChanged, this, &ApplicationManager1Service::ReloadApplications);
auto unhandled = m_watcher.addPaths(getDesktopFileDirs());

// Ensure all directories exist before adding watches
auto desktopDirs = getDesktopFileDirs();
for (const auto &dirPath : std::as_const(desktopDirs)) {
QDir dir(dirPath);
if (!dir.exists()) {
if (!dir.mkpath(dirPath)) {
qWarning() << "Failed to create directory:" << dirPath;
}
}
}

auto unhandled = m_watcher.addPaths(desktopDirs);
for (const auto &dir : std::as_const(unhandled)) {
qCritical() << "couldn't watch directory:" << dir;
}
Expand Down Expand Up @@ -682,12 +694,25 @@ QString ApplicationManager1Service::addUserApplication(const QVariantMap &deskto
}

QDir xdgDataHome;
QString dir{getXDGDataHome() + "/applications"};
QString dir{getXDGDataHome()};
// Ensure consistent path format (with trailing separator) to match getDesktopFileDirs()
if (!dir.endsWith(QDir::separator())) {
dir.append(QDir::separator());
}
dir.append("applications");
const bool dirExisted = QDir(dir).exists();
if (!xdgDataHome.mkpath(dir)) {
safe_sendErrorReply(QDBusError::Failed, "couldn't create directory of user applications.");
return {};
}

// If directory is newly created, add watch for it dynamically
if (!dirExisted && !m_watcher.directories().contains(dir)) {
if (!m_watcher.addPath(dir)) {
qWarning() << "Failed to add watch for newly created directory:" << dir;
}
}

// 判断当前是否已经存在了desktop文件
xdgDataHome.setPath(dir);
const auto &filePath = xdgDataHome.filePath(name);
Expand Down