Skip to content

refactor(launch): drop QUrl intermediary and unused workingDir param #375

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

Open
ComixHe wants to merge 1 commit into
base: master
Choose a base branch
from
+42 −25
Open

refactor(launch): drop QUrl intermediary and unused workingDir param #375

Show file tree
Hide file tree
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
65 changes: 41 additions & 24 deletions src/dbus/applicationservice.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -492,13 +492,10 @@ QDBusObjectPath ApplicationService::Launch(const QString &action, const QStringL
workingDir = std::move(optionPath);
}

if (!workingDir.isEmpty() && QDir::isRelativePath(workingDir)) {
qWarning() << "relative working dir is not supported: " << workingDir;
workingDir.clear();
}
optionsMap["path"] = workingDir;

auto cmds = generateCommand(optionsMap);
auto task = processExec(execStr, fields, workingDir);
auto task = processExec(execStr, fields);
if (!task) {
safe_sendErrorReply(QDBusError::InternalError, "Invalid Command.");
return {};
Expand Down Expand Up @@ -557,24 +554,45 @@ QDBusObjectPath ApplicationService::Launch(const QString &action, const QStringL

QStringList formattedRes;
if (!value.isNull()) {
QList<QUrl> urls;
if (value.canConvert<QList<QUrl>>()) {
urls = std::move(value).value<QList<QUrl>>();
if (value.canConvert<QStringList>()) {
formattedRes = value.value<QStringList>();
} else {
urls.append(std::move(value).value<QUrl>());
formattedRes.append(value.value<QString>());
}

formattedRes.reserve(urls.size());
for (const auto &url : std::as_const(urls)) {
if (!task.local) {
formattedRes << url.toString();
} else if (url.isLocalFile()) {
formattedRes << url.toLocalFile();
} else {
// TODO: Remote file handling logic
qWarning() << "Remote file not supported yet, skipping:" << url;
auto newLoc = task.argNum;
if (task.local) {
for (auto it = formattedRes.begin(); it != formattedRes.end();) {
const QUrl url{*it};
bool shouldErase = false;

if (!url.isValid()) {
qWarning() << "Invalid resource URL, skipping:" << *it;
shouldErase = true;
} else {
const auto scheme = url.scheme();
if (scheme == "file" || scheme.isEmpty()) {
*it = url.toLocalFile();
} else {
// TODO: Remote file handling logic
qWarning() << "Remote file not supported yet, skipping:" << *it;
shouldErase = true;
}
}

if (shouldErase) {
auto curLoc = std::distance(formattedRes.begin(), it);
if (curLoc < newLoc) {
--newLoc;
}
it = formattedRes.erase(it);
} else {
++it;
}
}
}

task.argNum = newLoc;
}

int originalIndex{0};
Expand Down Expand Up @@ -1488,7 +1506,7 @@ std::optional<QStringList> ApplicationService::splitExecArguments(QStringView st
return args;
}

LaunchTask ApplicationService::processExec(const QString &str, const QStringList &fields, const QString &dir) noexcept
LaunchTask ApplicationService::processExec(const QString &str, const QStringList &fields) const noexcept
{
auto args = splitExecArguments(str);
if (!args) {
Expand Down Expand Up @@ -1550,19 +1568,18 @@ LaunchTask ApplicationService::processExec(const QString &str, const QStringList
task.fieldLocation = processedArg.size();
task.local = (code.toLower() == u'f');

// respect the original url, replace it to exec directly
QList<QUrl> resources;
QStringList resources;
resources.reserve(fields.size());
for (const auto &field : fields) {
resources.emplace_back(QUrl::fromUserInput(field, dir, QUrl::AssumeLocalFile));
resources.emplace_back(field);
}

if (code.isUpper()) {
task.Resources.emplace_back(std::in_place_type<QList<QUrl>>, std::move(resources));
task.Resources.emplace_back(std::in_place_type<QStringList>, std::move(resources));
} else {
task.Resources.reserve(fields.size());
for (auto &&resource : resources) {
task.Resources.emplace_back(std::in_place_type<QUrl>, std::move(resource));
task.Resources.emplace_back(std::in_place_type<QString>, std::move(resource));
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/dbus/applicationservice.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ public Q_SLOTS:
void syncGeneratedAutostartEntry() noexcept;
void appendExtraEnvironments(QVariantMap &runtimeOptions) const noexcept;
void processCompatibility(const QString &action, QVariantMap &options, QString &execStr);
[[nodiscard]] LaunchTask processExec(const QString &str, const QStringList& fields, const QString& workingDir) noexcept;
[[nodiscard]] LaunchTask processExec(const QString &str, const QStringList &fields) const noexcept;
void closeSplashForInstance(const QString &instanceId) noexcept;
void closeAllSplashes() noexcept;
[[nodiscard]] ApplicationManager1Service *parent() { return dynamic_cast<ApplicationManager1Service *>(QObject::parent()); }
Expand Down
Loading