RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 10:27:35 +00:00
Code Issues Activity Actions

AK+Everywhere: Replace "protocol" with "scheme" url helpers

Browse source 
URL had properly named replacements for protocol(), set_protocol() and
create_with_file_protocol() already. This patch removes these function
and updates all call sites to use the functions named according to the
specification.

See https://url.spec.whatwg.org/#concept-url-scheme
This commit is contained in:
networkException 2022-09-29 01:30:58 +02:00 • committed by Linus Groh
parent 454bf1fde0
commit 4230dbbb21
61 changed files with 113 additions and 116 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Userland/Services/LaunchServer/Launcher.cpp
View file

@ -140,14 +140,14 @@ bool Launcher::has_mime_handlers(String const& mime_type)
Vector<String> Launcher::handlers_for_url(const URL& url)
{
Vector<String> handlers;
if (url.protocol() == "file") {
if (url.scheme() == "file") {
for_each_handler_for_path(url.path(), [&](auto& handler) -> bool {
handlers.append(handler.executable);
return true;
});
} else {
for_each_handler(url.protocol(), m_protocol_handlers, [&](auto const& handler) -> bool {
if (handler.handler_type != Handler::Type::Default || handler.protocols.contains(url.protocol())) {
for_each_handler(url.scheme(), m_protocol_handlers, [&](auto const& handler) -> bool {
if (handler.handler_type != Handler::Type::Default || handler.protocols.contains(url.scheme())) {
handlers.append(handler.executable);
return true;
}
@ -160,14 +160,14 @@ Vector<String> Launcher::handlers_for_url(const URL& url)
Vector<String> Launcher::handlers_with_details_for_url(const URL& url)
{
Vector<String> handlers;
if (url.protocol() == "file") {
if (url.scheme() == "file") {
for_each_handler_for_path(url.path(), [&](auto& handler) -> bool {
handlers.append(handler.to_details_str());
return true;
});
} else {
for_each_handler(url.protocol(), m_protocol_handlers, [&](auto const& handler) -> bool {
if (handler.handler_type != Handler::Type::Default || handler.protocols.contains(url.protocol())) {
for_each_handler(url.scheme(), m_protocol_handlers, [&](auto const& handler) -> bool {
if (handler.handler_type != Handler::Type::Default || handler.protocols.contains(url.scheme())) {
handlers.append(handler.to_details_str());
return true;
}
@ -196,10 +196,10 @@ bool Launcher::open_url(const URL& url, String const& handler_name)
if (!handler_name.is_null())
return open_with_handler_name(url, handler_name);
if (url.protocol() == "file")
if (url.scheme() == "file")
return open_file_url(url);
return open_with_user_preferences(m_protocol_handlers, url.protocol(), { url.to_string() });
return open_with_user_preferences(m_protocol_handlers, url.scheme(), { url.to_string() });
}
bool Launcher::open_with_handler_name(const URL& url, String const& handler_name)
@ -210,7 +210,7 @@ bool Launcher::open_with_handler_name(const URL& url, String const& handler_name
auto& handler = handler_optional.value();
String argument;
if (url.protocol() == "file")
if (url.scheme() == "file")
argument = url.path();
else
argument = url.to_string();