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

fix: incorrect behavior of processguesser1service

Browse Source 
Signed-off-by: ComixHe <heyuming@deepin.org>
This commit is contained in:
ComixHe 2023-11-16 11:46:41 +08:00 committed by Comix
parent 5f08edbc74
commit 2cc63722e7
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/dbus/processguesser1service.cpp
View File

@ -69,21 +69,27 @@ QString ProcessGuesser1Service::GuessApplicationId(const QDBusUnixFileDescriptor
QString appId; QString appId;
for (const QSharedPointer<ApplicationService> &app : applications) { for (const QSharedPointer<ApplicationService> &app : applications) {
auto exec = app->findEntryValue(DesktopFileEntryKey, "Exec", EntryValueType::Raw).toString(); auto tryExec = app->findEntryValue(DesktopFileEntryKey, "TryExec", EntryValueType::String).toString();
if (!tryExec.isEmpty() and !checkTryExec(tryExec)) {
qWarning() << "Couldn't find the binary which corresponding with process.";
continue;
}
auto exec = app->findEntryValue(DesktopFileEntryKey, "Exec", EntryValueType::String).toString();
if (exec.isEmpty()) { // NOTE: Exec is not required in desktop file. if (exec.isEmpty()) { // NOTE: Exec is not required in desktop file.
continue; continue;
} }
auto opt = ApplicationService::unescapeExecArgs(exec); auto opt = ApplicationService::unescapeExecArgs(exec);
if (!opt) { if (!opt) {
sendErrorReply(QDBusError::InternalError); qWarning() << app->id() << "unescape exec failed, skip.";
return {}; continue;
} }
auto execList = std::move(opt).value(); auto execList = std::move(opt).value();
if (execList.isEmpty()) { if (execList.isEmpty()) {
sendErrorReply(QDBusError::InternalError); qWarning() << "exec is empty,skip.";
return {}; continue;
} }
auto execBin = execList.first(); auto execBin = execList.first();
@ -94,17 +100,12 @@ QString ProcessGuesser1Service::GuessApplicationId(const QDBusUnixFileDescriptor
if (!execBin.isEmpty() and execBin == binary) { if (!execBin.isEmpty() and execBin == binary) {
if (!appId.isEmpty()) { if (!appId.isEmpty()) {
sendErrorReply(QDBusError::Failed, "Multiple binary have been detected."); auto msg = QString{"Multiple binary have been detected."};
qWarning() << msg << appId << app->id();
sendErrorReply(QDBusError::Failed, msg);
return {}; return {};
} }
appId = app->id(); appId = app->id();
continue;
}
auto tryExec = app->findEntryValue(DesktopFileEntryKey, "TryExec", EntryValueType::String).toString();
if (!checkTryExec(tryExec)) {
sendErrorReply(QDBusError::Failed, "Couldn't find the binary which corresponding with process.");
return {};
} }
} }