godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Enhance HTTPClient.query_string_from_dict() 

(cherry picked from commit 8d8e9d54c8)
This commit is contained in:
Pedro J. Estébanez 2018-03-17 13:09:26 +01:00
parent b6f30f1b5b
commit 46101928bd
2 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
core/io/http_client.cpp
View File

@ -618,7 +618,27 @@ String HTTPClient::query_string_from_dict(const Dictionary &p_dict) {
String query = ""; String query = "";
Array keys = p_dict.keys(); Array keys = p_dict.keys();
for (int i = 0; i < keys.size(); ++i) { for (int i = 0; i < keys.size(); ++i) {
query += "&" + String(keys[i]).http_escape() + "=" + String(p_dict[keys[i]]).http_escape(); String encoded_key = String(keys[i]).http_escape();
Variant value = p_dict[keys[i]];
switch (value.get_type()) {
case Variant::ARRAY: {
// Repeat the key with every values
Array values = value;
for (int j = 0; j < values.size(); ++j) {
query += "&" + encoded_key + "=" + String(values[j]).http_escape();
}
break;
}
case Variant::NIL: {
// Add the key with no value
query += "&" + encoded_key;
break;
}
default: {
// Add the key-value pair
query += "&" + encoded_key + "=" + String(value).http_escape();
}
}
} }
query.erase(0, 1); query.erase(0, 1);
return query; return query;

6
doc/classes/HTTPClient.xml
View File

@ -111,6 +111,12 @@
String queryString = httpClient.query_string_from_dict(fields) String queryString = httpClient.query_string_from_dict(fields)
returns:= "username=user&amp;password=pass" returns:= "username=user&amp;password=pass"
[/codeblock] [/codeblock]
Furthermore, if a key has a null value, only the key itself is added, without equal sign and value. If the value is an array, for each value in it a pair with the same key is added.
[codeblock]
var fields = {"single": 123, "not_valued": null, "multiple": [22, 33, 44]}
String queryString = httpClient.query_string_from_dict(fields)
returns:= "single=123&amp;not_valued&amp;multiple=22&amp;multiple=33&amp;multiple=44"
[/codeblock]
</description> </description>
</method> </method>
<method name="read_response_body_chunk"> <method name="read_response_body_chunk">