mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-08-07 08:39:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

LibDesktop+TaskBar: Propagate errors from AppFile::spawn and friends

Browse source 
Returning a boolean tells us nothing about why the spawn failed.
This commit is contained in:
Timothy Flynn 2024-04-30 12:02:28 -04:00 • committed by Andrew Kaster
commit dccd1cd348
Notes: sideshowbarker 2024-07-17 09:39:38 +09:00
3 changed files with 15 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -169,22 +169,19 @@ Vector<ByteString> AppFile::launcher_protocols() const
return protocols;
}
bool AppFile::spawn(ReadonlySpan<StringView> arguments) const
ErrorOr<void> AppFile::spawn(ReadonlySpan<StringView> arguments) const
{
if (!is_valid())
return false;
return Error::from_string_literal("AppFile is invalid");
auto pid = Core::Process::spawn(executable(), arguments, working_directory());
if (pid.is_error())
return false;
return true;
TRY(Core::Process::spawn(executable(), arguments, working_directory()));
return {};
}
bool AppFile::spawn_with_escalation(ReadonlySpan<StringView> user_arguments) const
ErrorOr<void> AppFile::spawn_with_escalation(ReadonlySpan<StringView> user_arguments) const
{
if (!is_valid())
return false;
return Error::from_string_literal("AppFile is invalid");
StringView exe;
Vector<StringView, 2> args;
@ -207,18 +204,15 @@ bool AppFile::spawn_with_escalation(ReadonlySpan<StringView> user_arguments) con
}
args.extend(Vector(user_arguments));
auto pid = Core::Process::spawn(exe, args.span(),
working_directory().is_empty() ? Core::StandardPaths::home_directory() : working_directory());
if (pid.is_error())
return false;
return true;
TRY(Core::Process::spawn(exe, args.span(),
working_directory().is_empty() ? Core::StandardPaths::home_directory() : working_directory()));
return {};
}
void AppFile::spawn_with_escalation_or_show_error(GUI::Window& window, ReadonlySpan<StringView> arguments) const
{
if (!spawn_with_escalation(arguments))
GUI::MessageBox::show_error(&window, ByteString::formatted("Failed to spawn {} with escalation", executable()));
if (auto result = spawn_with_escalation(arguments); result.is_error())
GUI::MessageBox::show_error(&window, ByteString::formatted("Failed to spawn {} with escalation: {}", executable(), result.error()));
}
}