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

feat: add env option and refactor command generate method

Browse Source 
Signed-off-by: ComixHe <heyuming@deepin.org>
This commit is contained in:
ComixHe
2023-08-30 18:36:52 +08:00
committed by Comix
parent 8ab6adc290
commit 1fb4539792
6 changed files with 191 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/dbus/applicationservice.cpp
View File

@ -6,7 +6,7 @@
#include "APPobjectmanager1adaptor.h"
#include "applicationmanager1service.h"
#include "dbus/instanceadaptor.h"
#include "pwd.h"
#include "launchoptions.h"
#include <QUuid>
#include <QStringList>
#include <QList>
@ -125,27 +125,13 @@ QDBusObjectPath ApplicationService::Launch(const QString &action, const QStringL
}
}
auto [bin, cmds, res] = unescapeExec(execStr, fields);
auto cmds = generateCommand(options);
uid_t uid;
auto it = options.find("uid");
if (it != options.cend()) {
uid = it->toUInt(&ok);
if (!ok) {
qWarning() << "convert uid string to uint failed: " << *it;
return {};
}
auto [bin, execCmds, res] = unescapeExec(execStr, fields);
if (uid != getCurrentUID()) {
cmds.prepend(userNameLookup(uid));
cmds.prepend("--user");
cmds.prepend("pkexec");
}
} else {
uid = getCurrentUID();
}
cmds.append(std::move(execCmds));
cmds.prepend("--");
qDebug() << "run application with:" << cmds;
auto &jobManager = static_cast<ApplicationManager1Service *>(parent())->jobManager();
@ -348,12 +334,6 @@ void ApplicationService::resetEntry(DesktopEntry *newEntry) noexcept
m_entry.reset(newEntry);
}
QString ApplicationService::userNameLookup(uid_t uid)
{
auto *pws = getpwuid(uid);
return pws->pw_name;
}
LaunchTask ApplicationService::unescapeExec(const QString &str, const QStringList &fields)
{
LaunchTask task;

1
src/dbus/applicationservice.h
View File

@ -97,7 +97,6 @@ private:
DesktopFile m_desktopSource;
QSharedPointer<DesktopEntry> m_entry{nullptr};
QMap<QDBusObjectPath, QSharedPointer<InstanceService>> m_Instances;
static QString userNameLookup(uid_t uid);
[[nodiscard]] LaunchTask unescapeExec(const QString &str, const QStringList &fields);
[[nodiscard]] QVariant findEntryValue(const QString &group,
const QString &valueKey,