Skip to content

Commit

Permalink
Unify http- and percent- encode/decode
Browse files Browse the repository at this point in the history 
There was a percent-prefixed version, which was exposed, and a http-prefixed version which was not (only to GDNative).
This commit keeps the percent-prefixed versions, but with the http-prefixed implementations.
  • Loading branch information
@RandomShaper
RandomShaper committed Mar 27, 2018
1 parent 4a5723f commit b76ee30
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 108 deletions.
2 changes: 1 addition & 1 deletion core/io/http_client.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -618,7 +618,7 @@ String HTTPClient::query_string_from_dict(const Dictionary &p_dict) {
String query = "";
Array keys = p_dict.keys();
for (int i = 0; i < keys.size(); ++i) {
query += "&" + String(keys[i]).http_escape() + "=" + String(p_dict[keys[i]]).http_escape();
query += "&" + String(keys[i]).percent_encode() + "=" + String(p_dict[keys[i]]).percent_encode();
}
query.erase(0, 1);
return query;
Expand Down
66 changes: 2 additions & 64 deletions core/ustring.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3165,7 +3165,7 @@ String String::word_wrap(int p_chars_per_line) const {
return ret;
}

String String::http_escape() const {
String String::percent_encode() const {
const CharString temp = utf8();
String res;
for (int i = 0; i < length(); ++i) {
Expand All @@ -3189,7 +3189,7 @@ String String::http_escape() const {
return res;
}

String String::http_unescape() const {
String String::percent_decode() const {
String res;
for (int i = 0; i < length(); ++i) {
if (ord_at(i) == '%' && i + 2 < length()) {
Expand Down Expand Up @@ -3727,68 +3727,6 @@ String String::plus_file(const String &p_file) const {
return *this + "/" + p_file;
}

String String::percent_encode() const {

CharString cs = utf8();
String encoded;
for (int i = 0; i < cs.length(); i++) {
uint8_t c = cs[i];
if ((c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z') || (c >= '0' && c <= '9') || c == '-' || c == '_' || c == '~' || c == '.') {

char p[2] = { (char)c, 0 };
encoded += p;
} else {
char p[4] = { '%', 0, 0, 0 };
static const char hex[16] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' };

p[1] = hex[c >> 4];
p[2] = hex[c & 0xF];
encoded += p;
}
}

return encoded;
}
String String::percent_decode() const {

CharString pe;

CharString cs = utf8();
for (int i = 0; i < cs.length(); i++) {

uint8_t c = cs[i];
if (c == '%' && i < length() - 2) {

uint8_t a = LOWERCASE(cs[i + 1]);
uint8_t b = LOWERCASE(cs[i + 2]);

c = 0;
if (a >= '0' && a <= '9')
c = (a - '0') << 4;
else if (a >= 'a' && a <= 'f')
c = (a - 'a' + 10) << 4;
else
continue;

uint8_t d = 0;

if (b >= '0' && b <= '9')
d = (b - '0');
else if (b >= 'a' && b <= 'f')
d = (b - 'a' + 10);
else
continue;
c += d;
i += 2;
}
pe.push_back(c);
}

pe.push_back(0);

return String::utf8(pe.ptr());
}

String String::get_basename() const {

int pos = find_last(".");
Expand Down
7 changes: 2 additions & 5 deletions core/ustring.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -226,17 +226,14 @@ class String : public Vector<CharType> {

String xml_escape(bool p_escape_quotes = false) const;
String xml_unescape() const;
String http_escape() const;
String http_unescape() const;
String percent_encode() const;
String percent_decode() const;
String c_escape() const;
String c_escape_multiline() const;
String c_unescape() const;
String json_escape() const;
String word_wrap(int p_chars_per_line) const;

String percent_encode() const;
String percent_decode() const;

bool is_valid_identifier() const;
bool is_valid_integer() const;
bool is_valid_float() const;
Expand Down
2 changes: 1 addition & 1 deletion editor/plugins/asset_library_editor_plugin.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -902,7 +902,7 @@ void EditorAssetLibrary::_search(int p_page) {
}

if (filter->get_text() != String()) {
args += "&filter=" + filter->get_text().http_escape();
args += "&filter=" + filter->get_text().percent_encode();
}

if (p_page > 0) {
Expand Down
18 changes: 0 additions & 18 deletions modules/gdnative/gdnative/string.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1168,24 +1168,6 @@ godot_string GDAPI godot_string_c_unescape(const godot_string *p_self) {
return result;
}

godot_string GDAPI godot_string_http_escape(const godot_string *p_self) {
const String *self = (const String *)p_self;
godot_string result;
String return_value = self->http_escape();
memnew_placement(&result, String(return_value));

return result;
}

godot_string GDAPI godot_string_http_unescape(const godot_string *p_self) {
const String *self = (const String *)p_self;
godot_string result;
String return_value = self->http_unescape();
memnew_placement(&result, String(return_value));

return result;
}

godot_string GDAPI godot_string_json_escape(const godot_string *p_self) {
const String *self = (const String *)p_self;
godot_string result;
Expand Down
14 changes: 0 additions & 14 deletions modules/gdnative/gdnative_api.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5467,20 +5467,6 @@
["const godot_string *", "p_self"]
]
},
{
"name": "godot_string_http_escape",
"return_type": "godot_string",
"arguments": [
["const godot_string *", "p_self"]
]
},
{
"name": "godot_string_http_unescape",
"return_type": "godot_string",
"arguments": [
["const godot_string *", "p_self"]
]
},
{
"name": "godot_string_json_escape",
"return_type": "godot_string",
Expand Down
7 changes: 2 additions & 5 deletions modules/gdnative/include/gdnative/string.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -228,17 +228,14 @@ godot_string GDAPI godot_string_simplify_path(const godot_string *p_self);
godot_string GDAPI godot_string_c_escape(const godot_string *p_self);
godot_string GDAPI godot_string_c_escape_multiline(const godot_string *p_self);
godot_string GDAPI godot_string_c_unescape(const godot_string *p_self);
godot_string GDAPI godot_string_http_escape(const godot_string *p_self);
godot_string GDAPI godot_string_http_unescape(const godot_string *p_self);
godot_string GDAPI godot_string_percent_decode(const godot_string *p_self);
godot_string GDAPI godot_string_percent_encode(const godot_string *p_self);
godot_string GDAPI godot_string_json_escape(const godot_string *p_self);
godot_string GDAPI godot_string_word_wrap(const godot_string *p_self, godot_int p_chars_per_line);
godot_string GDAPI godot_string_xml_escape(const godot_string *p_self);
godot_string GDAPI godot_string_xml_escape_with_quotes(const godot_string *p_self);
godot_string GDAPI godot_string_xml_unescape(const godot_string *p_self);

godot_string GDAPI godot_string_percent_decode(const godot_string *p_self);
godot_string GDAPI godot_string_percent_encode(const godot_string *p_self);

godot_bool GDAPI godot_string_is_valid_float(const godot_string *p_self);
godot_bool GDAPI godot_string_is_valid_hex_number(const godot_string *p_self, godot_bool p_with_prefix);
godot_bool GDAPI godot_string_is_valid_html_color(const godot_string *p_self);
Expand Down

0 comments on commit b76ee30

Please sign in to comment.