e621ng/dtext_rb
1
0
Fork 0
mirror of https://github.com/e621ng/dtext_rb.git synced 2025-03-04 03:03:03 -05:00
Code Packages Projects Releases Activity

Refactor URL escaping to not use GLib

Browse Source 
2defa2f62b

Co-Authored-By: evazion <noizave@gmail.com>
This commit is contained in:
Earlopain 2023-03-29 16:54:48 +02:00
parent 6e76ea1c0b
commit bb8a7856f0
No known key found for this signature in database
GPG Key ID: 6CFB948E15246897
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ext/dtext/dtext.cpp.rl
View File

@ -887,14 +887,19 @@ static inline void append_segment(StateMachine * sm, const char * a, const char
sm->output.append(a, b - a + 1);
}
static inline void append_segment_uri_escaped(StateMachine * sm, const char * a, const char * b) {
g_autofree char* escaped = g_uri_escape_bytes((const guint8 *)a, b - a + 1, NULL);
sm->output += escaped;
}
static inline void append_segment_uri_escaped(StateMachine * sm, const char * a, const char * b, const char whitelist = '-') {
static const char hex[] = "0123456789ABCDEF";
const std::string_view input(a, b - a + 1);
static inline void append_segment_uri_possible_fragment_escaped(StateMachine * sm, const char * a, const char * b) {
g_autofree char* escaped = g_uri_escape_bytes((const guint8 *)a, b - a + 1, "#");
sm->output += escaped;
for (const unsigned char c : input) {
if (isalnum(c) || c == '-' || c == '_' || c == '.' || c == '~' || c == whitelist) {
sm->output += c;
} else {
sm->output += '%';
sm->output += hex[c >> 4];
sm->output += hex[c & 0x0F];
}
}
}
static inline void append_segment_html_escaped(StateMachine * sm, const char * a, const char * b) {
@ -967,7 +972,7 @@ static inline void append_wiki_link(StateMachine * sm, const char * tag_segment,
} else {
append(sm, "<a rel=\"nofollow\" class=\"dtext-link dtext-wiki-link\" href=\"");
append_url(sm, "/wiki_pages/show_or_new?title=");
append_segment_uri_possible_fragment_escaped(sm, normalized_tag.c_str(), normalized_tag.c_str() + normalized_tag.size() - 1);
append_segment_uri_escaped(sm, normalized_tag.c_str(), normalized_tag.c_str() + normalized_tag.size() - 1, '#');
append(sm, "\">");
}
append_segment_html_escaped(sm, title_segment, title_segment + title_len - 1);