oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-08-01 17:38:41 +00:00
Code Wiki Activity

Update to new ContentDB API

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

15
src/content/packages.cpp
View file

@ -43,24 +43,19 @@ std::vector<Package> getPackagesFromURL(const std::string &url)
for (unsigned int i = 0; i < json.size(); ++i) {
Package package;
package.author = json[i]["author"].asString();
package.name = json[i]["name"].asString();
package.title = json[i]["title"].asString();
package.author = json[i]["author"].asString();
package.type = json[i]["type"].asString();
package.shortDesc = json[i]["shortDesc"].asString();
package.url = json[i]["url"].asString();
package.release = json[i]["release"].asInt();
if (json[i].isMember("thumbnail"))
package.thumbnail = json[i]["thumbnail"].asString();
Json::Value jScreenshots = json[i]["screenshots"];
for (unsigned int j = 0; j < jScreenshots.size(); ++j) {
package.screenshots.push_back(jScreenshots[j].asString());
}
if (package.valid()) {
if (package.valid())
packages.push_back(package);
} else {
else
errorstream << "Invalid package at " << i << std::endl;
}
}
return packages;

16
src/content/packages.h
View file

@ -24,20 +24,24 @@ with this program; if not, write to the Free Software Foundation, Inc.,
struct Package
{
std::string author;
std::string name; // Technical name
std::string title;
std::string author;
std::string type; // One of "mod", "game", or "txp"
std::string shortDesc;
std::string url; // download URL
u32 release;
std::vector<std::string> screenshots;
std::string thumbnail;
bool valid()
bool valid() const
{
return !(name.empty() || title.empty() || author.empty() ||
type.empty() || url.empty() || release <= 0);
return !(author.empty() || name.empty() || title.empty() ||
type.empty() || release <= 0);
}
std::string getDownloadURL(const std::string &baseURL) const
{
return baseURL + "/packages/" + author + "/" + name + "/download/";
}
};

32
src/script/lua_api/l_mainmenu.cpp
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++;