mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-09-11 20:16:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

LibDesktop: Add an "Arguments" field to AppFile

Browse source 
This allows specifying arguments to be passed to the AppFile executable.
The Arguments string is delimted by ASCII spaces.
This commit is contained in:
Timothy Flynn 2024-04-30 12:23:17 -04:00 • committed by Andrew Kaster
commit b5e5354515
Notes: sideshowbarker 2024-07-17 06:39:26 +09:00
2 changed files with 21 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Userland/Libraries/LibDesktop/AppFile.cpp
View file

@ -91,6 +91,12 @@ ByteString AppFile::executable() const
return executable;
}
Vector<ByteString> AppFile::arguments() const
{
auto arguments = m_config->read_entry("App", "Arguments").trim_whitespace();
return arguments.split(' ');
}
ByteString AppFile::description() const
{
return m_config->read_entry("App", "Description").trim_whitespace();
@ -169,12 +175,20 @@ Vector<ByteString> AppFile::launcher_protocols() const
return protocols;
}
ErrorOr<void> AppFile::spawn(ReadonlySpan<StringView> arguments) const
ErrorOr<void> AppFile::spawn(ReadonlySpan<StringView> user_arguments) const
{
if (!is_valid())
return Error::from_string_literal("AppFile is invalid");
TRY(Core::Process::spawn(executable(), arguments, working_directory()));
Vector<StringView> args;
auto arguments = AppFile::arguments();
for (auto const& argument : arguments)
args.append(argument);
args.extend(Vector(user_arguments));
TRY(Core::Process::spawn(executable(), args, working_directory()));
return {};
}
@ -187,6 +201,10 @@ ErrorOr<void> AppFile::spawn_with_escalation(ReadonlySpan<StringView> user_argum
Vector<StringView, 2> args;
auto executable = AppFile::executable();
auto arguments = AppFile::arguments();
for (auto const& argument : arguments)
args.append(argument);
// FIXME: These single quotes won't be enough for executables with single quotes in their name.
auto pls_with_executable = ByteString::formatted("/bin/pls '{}'", executable);

1
Userland/Libraries/LibDesktop/AppFile.h
View file

@ -33,6 +33,7 @@ public:
ByteString name() const;
ByteString menu_name() const;
ByteString executable() const;
Vector<ByteString> arguments() const;
ByteString category() const;
ByteString description() const;
ByteString working_directory() const;