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

AK: Remove URLParser

Browse source 
This removes URLParser, because its two exposed functions, urlencode()
and urldecode(), have been superseded by URL::percent_encode() and
URL::percent_decode(). This is in preparation for the introduction of a
new URL parser.
This commit is contained in:
Max Wipfli 2021-05-25 14:40:50 +02:00 • committed by Andreas Kling
parent a603e69599
commit 0d41a7d39a
4 changed files with 0 additions and 108 deletions
Download patch file Download diff file Expand all files Collapse all files

87
AK/URLParser.cpp
View file

@ -1,87 +0,0 @@
/*
* Copyright (c) 2020, Andreas Kling <kling@serenityos.org>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
#include <AK/Optional.h>
#include <AK/String.h>
#include <AK/StringBuilder.h>
#include <AK/StringUtils.h>
#include <AK/URLParser.h>
namespace AK {
static bool is_ascii_hex_digit(u8 ch)
{
return (ch >= '0' && ch <= '9') || (ch >= 'a' && ch <= 'f') || (ch >= 'A' && ch <= 'F');
}
String urldecode(const StringView& input)
{
size_t cursor = 0;
auto peek = [&](size_t offset = 0) -> u8 {
if (cursor + offset >= input.length())
return 0;
return input[cursor + offset];
};
auto consume = [&] {
return input[cursor++];
};
StringBuilder builder;
while (cursor < input.length()) {
if (peek() != '%') {
builder.append(consume());
continue;
}
if (!is_ascii_hex_digit(peek(1)) || !is_ascii_hex_digit(peek(2))) {
builder.append(consume());
continue;
}
auto byte_point = StringUtils::convert_to_uint_from_hex(input.substring_view(cursor + 1, 2));
builder.append(byte_point.value());
consume();
consume();
consume();
}
return builder.to_string();
}
static inline bool in_c0_control_set(u32 c)
{
return c <= 0x1f || c > '~';
}
static inline bool in_fragment_set(u32 c)
{
return in_c0_control_set(c) || c == ' ' || c == '"' || c == '<' || c == '>' || c == '`';
}
static inline bool in_path_set(u32 c)
{
return in_fragment_set(c) || c == '#' || c == '?' || c == '{' || c == '}';
}
static inline bool in_userinfo_set(u32 c)
{
return in_path_set(c) || c == '/' || c == ':' || c == ';' || c == '=' || c == '@' || (c >= '[' && c <= '^') || c == '|';
}
String urlencode(const StringView& input, const StringView& exclude)
{
StringBuilder builder;
for (unsigned char ch : input) {
if (in_userinfo_set((u8)ch) && !exclude.contains(ch)) {
builder.append('%');
builder.appendff("{:02X}", ch);
} else {
builder.append(ch);
}
}
return builder.to_string();
}
}

19
AK/URLParser.h
View file

@ -1,19 +0,0 @@
/*
* Copyright (c) 2020, Andreas Kling <kling@serenityos.org>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
#pragma once
#include <AK/StringView.h>
namespace AK {
String urlencode(const StringView&, const StringView& exclude = {});
String urldecode(const StringView&);
}
using AK::urldecode;
using AK::urlencode;

1
Userland/Applications/Run/RunWindow.cpp
View file

@ -7,7 +7,6 @@
#include "RunWindow.h" #include "RunWindow.h"
#include <AK/LexicalPath.h> #include <AK/LexicalPath.h>
#include <AK/URL.h> #include <AK/URL.h>
#include <AK/URLParser.h>
#include <Applications/Run/RunGML.h> #include <Applications/Run/RunGML.h>
#include <LibCore/File.h> #include <LibCore/File.h>
#include <LibCore/StandardPaths.h> #include <LibCore/StandardPaths.h>

1
Userland/Libraries/LibWeb/OutOfProcessWebView.cpp
View file

@ -7,7 +7,6 @@
#include "OutOfProcessWebView.h" #include "OutOfProcessWebView.h"
#include "WebContentClient.h" #include "WebContentClient.h"
#include <AK/String.h> #include <AK/String.h>
#include <AK/URLParser.h>
#include <LibGUI/Application.h> #include <LibGUI/Application.h>
#include <LibGUI/Desktop.h> #include <LibGUI/Desktop.h>
#include <LibGUI/InputBox.h> #include <LibGUI/InputBox.h>