Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-11-27 10:03:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

HTTP API: Allow binary downloads and headers (#8573)

Browse Source 
Add minetest.features.httpfetch_binary_data
This commit is contained in:
SmallJoker 2019-06-06 19:13:29 +02:00 committed by GitHub
parent 7379aa74cf
commit cb00632e23
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
builtin/game/features.lua
View File

@ -12,6 +12,7 @@ core.features = {
no_chat_message_prediction = true, no_chat_message_prediction = true,
object_use_texture_alpha = true, object_use_texture_alpha = true,
object_independent_selectionbox = true, object_independent_selectionbox = true,
httpfetch_binary_data = true,
} }
function core.has_feature(arg) function core.has_feature(arg)

7
doc/lua_api.txt
View File

@ -3527,11 +3527,14 @@ Utilities
-- Chat messages are no longer predicted (0.4.16) -- Chat messages are no longer predicted (0.4.16)
no_chat_message_prediction = true, no_chat_message_prediction = true,
-- The transparency channel of textures can optionally be used on -- The transparency channel of textures can optionally be used on
-- objects (ie: players and lua entities) (5.0) -- objects (ie: players and lua entities) (5.0.0)
object_use_texture_alpha = true, object_use_texture_alpha = true,
-- Object selectionbox is settable independently from collisionbox -- Object selectionbox is settable independently from collisionbox
-- (5.0) -- (5.0.0)
object_independent_selectionbox = true, object_independent_selectionbox = true,
-- Specifies whether binary data can be uploaded or downloaded using
-- the HTTP API (5.1.0)
httpfetch_binary_data = true,
} }
* `minetest.has_feature(arg)`: returns `boolean, missing_features` * `minetest.has_feature(arg)`: returns `boolean, missing_features`

4
src/script/common/c_converter.cpp
View File

@ -540,9 +540,9 @@ v3s16 getv3s16field_default(lua_State *L, int table,
} }
void setstringfield(lua_State *L, int table, void setstringfield(lua_State *L, int table,
const char *fieldname, const char *value) const char *fieldname, const std::string &value)
{ {
lua_pushstring(L, value); lua_pushlstring(L, value.c_str(), value.length());
if(table < 0) if(table < 0)
table -= 1; table -= 1;
lua_setfield(L, table, fieldname); lua_setfield(L, table, fieldname);

2
src/script/common/c_converter.h
View File

@ -91,7 +91,7 @@ std::string checkstringfield(lua_State *L, int table,
const char *fieldname); const char *fieldname);
void setstringfield(lua_State *L, int table, void setstringfield(lua_State *L, int table,
const char *fieldname, const char *value); const char *fieldname, const std::string &value);
void setintfield(lua_State *L, int table, void setintfield(lua_State *L, int table,
const char *fieldname, int value); const char *fieldname, int value);
void setfloatfield(lua_State *L, int table, void setfloatfield(lua_State *L, int table,

5
src/script/common/helper.cpp
View File

@ -107,9 +107,10 @@ template <> v2f LuaHelper::readParam(lua_State *L, int index)
template <> std::string LuaHelper::readParam(lua_State *L, int index) template <> std::string LuaHelper::readParam(lua_State *L, int index)
{ {
size_t length;
std::string result; std::string result;
const char *str = luaL_checkstring(L, index); const char *str = luaL_checklstring(L, index, &length);
result.append(str); result.assign(str, length);
return result; return result;
} }

13
src/script/lua_api/l_http.cpp
View File

@ -53,9 +53,8 @@ void ModApiHttp::read_http_fetch_request(lua_State *L, HTTPFetchRequest &req)
lua_getfield(L, 1, "post_data"); lua_getfield(L, 1, "post_data");
if (lua_istable(L, 2)) { if (lua_istable(L, 2)) {
lua_pushnil(L); lua_pushnil(L);
while (lua_next(L, 2) != 0) while (lua_next(L, 2) != 0) {
{ req.post_fields[readParam<std::string>(L, -2)] = readParam<std::string>(L, -1);
req.post_fields[luaL_checkstring(L, -2)] = luaL_checkstring(L, -1);
lua_pop(L, 1); lua_pop(L, 1);
} }
} else if (lua_isstring(L, 2)) { } else if (lua_isstring(L, 2)) {
@ -66,10 +65,8 @@ void ModApiHttp::read_http_fetch_request(lua_State *L, HTTPFetchRequest &req)
lua_getfield(L, 1, "extra_headers"); lua_getfield(L, 1, "extra_headers");
if (lua_istable(L, 2)) { if (lua_istable(L, 2)) {
lua_pushnil(L); lua_pushnil(L);
while (lua_next(L, 2) != 0) while (lua_next(L, 2) != 0) {
{ req.extra_headers.emplace_back(readParam<std::string>(L, -1));
const char *header = luaL_checkstring(L, -1);
req.extra_headers.emplace_back(header);
lua_pop(L, 1); lua_pop(L, 1);
} }
} }
@ -83,7 +80,7 @@ void ModApiHttp::push_http_fetch_result(lua_State *L, HTTPFetchResult &res, bool
setboolfield(L, -1, "timeout", res.timeout); setboolfield(L, -1, "timeout", res.timeout);
setboolfield(L, -1, "completed", completed); setboolfield(L, -1, "completed", completed);
setintfield(L, -1, "code", res.response_code); setintfield(L, -1, "code", res.response_code);
setstringfield(L, -1, "data", res.data.c_str()); setstringfield(L, -1, "data", res.data);
} }
// http_api.fetch_async(HTTPRequest definition) // http_api.fetch_async(HTTPRequest definition)