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

fix: Manual removal of symbolic links leads to state error

Browse Source 
Signed-off-by: ComixHe <heyuming@deepin.org>
This commit is contained in:
ComixHe
2023-09-06 13:22:01 +08:00
committed by Comix
parent 4d6e399653
commit 8d033daf6b
2 changed files with 27 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/dbus/applicationservice.cpp
View File

@ -376,40 +376,45 @@ qulonglong ApplicationService::lastLaunchedTime() const noexcept
return m_lastLaunch;
}
bool ApplicationService::autostartCheck(const QString &linkPath) noexcept
{
QFileInfo info{linkPath};
if (!info.exists() or !info.isSymbolicLink()) {
qWarning() << "same name desktop file exists:" << linkPath << "but this may not created by AM.";
return false;
}
return true;
}
bool ApplicationService::isAutoStart() const noexcept
{
return m_AutoStart;
auto path = getAutoStartDirs().first();
auto linkName = QDir{path}.filePath(m_desktopSource.desktopId() + ".desktop");
return autostartCheck(linkName);
}
void ApplicationService::setAutoStart(bool autostart) noexcept
{
if (autostart == m_AutoStart) {
return;
}
auto path = getAutoStartDirs().first();
auto linkName = QDir{path}.filePath(m_desktopSource.desktopId() + ".desktop");
auto &file = m_desktopSource.sourceFileRef();
if (autostart) {
if (!file.link(linkName)) {
if (!autostartCheck(linkName) and !file.link(linkName)) {
qWarning() << "link to autostart failed:" << file.errorString();
return;
}
} else {
QFileInfo info{linkName};
if (!info.exists() or !info.isSymbolicLink()) {
qWarning() << "same name desktop file exists:" << linkName << "but this may not created by AM.";
return;
}
QFile linkFile{linkName};
if (!linkFile.remove()) {
qWarning() << "remove link failed:" << linkFile.errorString();
return;
if (autostartCheck(linkName)) {
QFile linkFile{linkName};
if (!linkFile.remove()) {
qWarning() << "remove link failed:" << linkFile.errorString();
return;
}
}
}
m_AutoStart = autostart;
}
QList<QDBusObjectPath> ApplicationService::instances() const noexcept