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

fix: relink to autostart when dekstopFile has been changed

Browse Source 
Signed-off-by: ComixHe <heyuming@deepin.org>
This commit is contained in:
ComixHe 2023-09-15 14:44:27 +08:00 committed by Comix
parent b2b5c23a2b
commit 7d94a8b71d
5 changed files with 38 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/dbus/applicationmanager1service.cpp
View File

@ -386,9 +386,14 @@ void ApplicationManager1Service::updateApplication(const QSharedPointer<Applicat
if (destApp->m_entry != newEntry) { if (destApp->m_entry != newEntry) {
destApp->resetEntry(newEntry); destApp->resetEntry(newEntry);
destApp->m_desktopSource = std::move(desktopFile);
destApp->detachAllInstance(); destApp->detachAllInstance();
} }
if (destApp->m_desktopSource != desktopFile and destApp->isAutoStart()) {
destApp->setAutoStart(false);
destApp->m_desktopSource = std::move(desktopFile);
destApp->setAutoStart(true);
}
} }
void ApplicationManager1Service::ReloadApplications() void ApplicationManager1Service::ReloadApplications()

4
src/dbus/applicationservice.cpp
View File

@ -421,12 +421,12 @@ qulonglong ApplicationService::lastLaunchedTime() const noexcept
return m_lastLaunch; return m_lastLaunch;
} }
bool ApplicationService::autostartCheck(const QString &linkPath) noexcept bool ApplicationService::autostartCheck(const QString &linkPath) const noexcept
{ {
QFileInfo info{linkPath}; QFileInfo info{linkPath};
if (info.exists()) { if (info.exists()) {
if (info.isSymbolicLink()) { if (info.isSymbolicLink() and info.symLinkTarget() == m_desktopSource.sourcePath()) {
return true; return true;
} }
qWarning() << "same name desktop file exists:" << linkPath << "but this may not created by AM."; qWarning() << "same name desktop file exists:" << linkPath << "but this may not created by AM.";

2
src/dbus/applicationservice.h
View File

@ -146,7 +146,7 @@ private:
const QLocale &locale = getUserLocale()) const noexcept; const QLocale &locale = getUserLocale()) const noexcept;
void updateAfterLaunch(bool isLaunch) noexcept; void updateAfterLaunch(bool isLaunch) noexcept;
static bool shouldBeShown(const std::unique_ptr<DesktopEntry> &entry) noexcept; static bool shouldBeShown(const std::unique_ptr<DesktopEntry> &entry) noexcept;
static bool autostartCheck(const QString &linkPath) noexcept; [[nodiscard]] bool autostartCheck(const QString &linkPath) const noexcept;
}; };
#endif #endif

22
src/desktopentry.cpp
View File

@ -556,6 +556,28 @@ bool operator!=(const DesktopEntry &lhs, const DesktopEntry &rhs)
return !(lhs == rhs); return !(lhs == rhs);
} }
bool operator==(const DesktopFile &lhs, const DesktopFile &rhs)
{
if (lhs.m_desktopId != rhs.m_desktopId) {
return false;
}
if (lhs.sourcePath() != rhs.sourcePath()) {
return false;
}
if (lhs.m_ctime != rhs.m_ctime or lhs.m_mtime != rhs.m_mtime) {
return false;
}
return true;
}
bool operator!=(const DesktopFile &lhs, const DesktopFile &rhs)
{
return !(lhs == rhs);
}
QDebug operator<<(QDebug debug, const DesktopEntry::Value &v) QDebug operator<<(QDebug debug, const DesktopEntry::Value &v)
{ {
QDebugStateSaver saver{debug}; QDebugStateSaver saver{debug};

7
src/desktopentry.h
View File

@ -50,6 +50,9 @@ struct DesktopFile
[[nodiscard]] bool modified(qint64 time) const noexcept; [[nodiscard]] bool modified(qint64 time) const noexcept;
[[nodiscard]] qint64 createTime() const noexcept { return m_ctime; } [[nodiscard]] qint64 createTime() const noexcept { return m_ctime; }
friend bool operator==(const DesktopFile &lhs, const DesktopFile &rhs);
friend bool operator!=(const DesktopFile &lhs, const DesktopFile &rhs);
static std::optional<DesktopFile> searchDesktopFileById(const QString &appId, DesktopErrorCode &err) noexcept; static std::optional<DesktopFile> searchDesktopFileById(const QString &appId, DesktopErrorCode &err) noexcept;
static std::optional<DesktopFile> searchDesktopFileByPath(const QString &desktopFilePath, DesktopErrorCode &err) noexcept; static std::optional<DesktopFile> searchDesktopFileByPath(const QString &desktopFilePath, DesktopErrorCode &err) noexcept;
static std::optional<DesktopFile> createTemporaryDesktopFile(const QString &temporaryFile) noexcept; static std::optional<DesktopFile> createTemporaryDesktopFile(const QString &temporaryFile) noexcept;
@ -157,4 +160,8 @@ bool operator==(const DesktopEntry &lhs, const DesktopEntry &rhs);
bool operator!=(const DesktopEntry &lhs, const DesktopEntry &rhs); bool operator!=(const DesktopEntry &lhs, const DesktopEntry &rhs);
bool operator==(const DesktopFile &lhs, const DesktopFile &rhs);
bool operator!=(const DesktopFile &lhs, const DesktopFile &rhs);
#endif #endif