1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00

Update to new ContentDB API

This commit is contained in:
rubenwardy 2018-06-18 20:47:38 +01:00 committed by GitHub
parent e8b687d7ca
commit ca502fc274
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 35 additions and 42 deletions

View file

@ -1005,7 +1005,7 @@ int ModApiMainMenu::l_get_screen_info(lua_State *L)
int ModApiMainMenu::l_get_package_list(lua_State *L)
{
std::string url = g_settings->get("contentdb_url");
std::vector<Package> packages = getPackagesFromURL(url + "/packages/");
std::vector<Package> packages = getPackagesFromURL(url + "/api/packages/");
// Make table
lua_newtable(L);
@ -1019,6 +1019,10 @@ int ModApiMainMenu::l_get_package_list(lua_State *L)
int top_lvl2 = lua_gettop(L);
lua_pushstring(L, "author");
lua_pushstring(L, package.author.c_str());
lua_settable (L, top_lvl2);
lua_pushstring(L, "name");
lua_pushstring(L, package.name.c_str());
lua_settable (L, top_lvl2);
@ -1027,10 +1031,6 @@ int ModApiMainMenu::l_get_package_list(lua_State *L)
lua_pushstring(L, package.title.c_str());
lua_settable (L, top_lvl2);
lua_pushstring(L, "author");
lua_pushstring(L, package.author.c_str());
lua_settable (L, top_lvl2);
lua_pushstring(L, "type");
lua_pushstring(L, package.type.c_str());
lua_settable (L, top_lvl2);
@ -1039,25 +1039,19 @@ int ModApiMainMenu::l_get_package_list(lua_State *L)
lua_pushstring(L, package.shortDesc.c_str());
lua_settable (L, top_lvl2);
lua_pushstring(L, "url");
lua_pushstring(L, package.url.c_str());
lua_settable (L, top_lvl2);
lua_pushstring (L, "release");
lua_pushinteger(L, package.release);
lua_settable (L, top_lvl2);
lua_pushstring(L, "screenshots");
lua_newtable(L);
{
int top_screenshots = lua_gettop(L);
for (size_t i = 0; i < package.screenshots.size(); ++i) {
lua_pushnumber(L, i + 1);
lua_pushstring(L, package.screenshots[i].c_str());
lua_settable(L, top_screenshots);
}
if (package.thumbnail != "") {
lua_pushstring(L, "thumbnail");
lua_pushstring(L, package.thumbnail.c_str());
lua_settable (L, top_lvl2);
}
lua_settable(L, top_lvl2);
lua_pushstring(L, "url");
lua_pushstring(L, package.getDownloadURL(url).c_str());
lua_settable (L, top_lvl2);
lua_settable(L, top);
index++;