From ca502fc274c640f1e301a77ecb336ab5a23d348d Mon Sep 17 00:00:00 2001 From: rubenwardy Date: Mon, 18 Jun 2018 20:47:38 +0100 Subject: Update to new ContentDB API --- src/script/lua_api/l_mainmenu.cpp | 32 +++++++++++++------------------- 1 file changed, 13 insertions(+), 19 deletions(-) (limited to 'src/script') diff --git a/src/script/lua_api/l_mainmenu.cpp b/src/script/lua_api/l_mainmenu.cpp index 1f49fc211..a5b211bc7 100644 --- a/src/script/lua_api/l_mainmenu.cpp +++ b/src/script/lua_api/l_mainmenu.cpp @@ -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 packages = getPackagesFromURL(url + "/packages/"); + std::vector 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++; -- cgit v1.2.3