BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Add protocol_version and supported package types to ContentDB urls

Browse Source
This commit is contained in:
rubenwardy 2018-07-29 00:26:03 +01:00 committed by GitHub
parent 2b83af783b
commit 14011bdc7a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/content/packages.cpp
View File

@ -25,6 +25,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "content/mods.h" #include "content/mods.h"
#include "content/subgames.h" #include "content/subgames.h"
std::string Package::getDownloadURL(const std::string &baseURL) const
{
return baseURL + "/packages/" + author + "/" + name + "/releases/" +
std::to_string(release) + "/download/";
}
#if USE_CURL #if USE_CURL
std::vector<Package> getPackagesFromURL(const std::string &url) std::vector<Package> getPackagesFromURL(const std::string &url)
{ {
@ -60,5 +66,4 @@ std::vector<Package> getPackagesFromURL(const std::string &url)
return packages; return packages;
} }
#endif #endif

5
src/content/packages.h
View File

@ -39,10 +39,7 @@ struct Package
type.empty() || release <= 0); type.empty() || release <= 0);
} }
std::string getDownloadURL(const std::string &baseURL) const std::string getDownloadURL(const std::string &baseURL) const;
{
return baseURL + "/packages/" + author + "/" + name + "/download/";
}
}; };
#if USE_CURL #if USE_CURL

1
src/network/networkprotocol.h
View File

@ -191,6 +191,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
*/ */
#define LATEST_PROTOCOL_VERSION 36 #define LATEST_PROTOCOL_VERSION 36
#define LATEST_PROTOCOL_VERSION_STRING TOSTRING(LATEST_PROTOCOL_VERSION)
// Server's supported network protocol range // Server's supported network protocol range
#define SERVER_PROTOCOL_VERSION_MIN 36 #define SERVER_PROTOCOL_VERSION_MIN 36

5
src/script/lua_api/l_mainmenu.cpp
View File

@ -39,6 +39,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include <IFileArchive.h> #include <IFileArchive.h>
#include <IFileSystem.h> #include <IFileSystem.h>
#include "client/renderingengine.h" #include "client/renderingengine.h"
#include "network/networkprotocol.h"
/******************************************************************************/ /******************************************************************************/
@ -993,7 +994,9 @@ int ModApiMainMenu::l_get_screen_info(lua_State *L)
int ModApiMainMenu::l_get_package_list(lua_State *L) int ModApiMainMenu::l_get_package_list(lua_State *L)
{ {
std::string url = g_settings->get("contentdb_url"); std::string url = g_settings->get("contentdb_url");
std::vector<Package> packages = getPackagesFromURL(url + "/api/packages/"); std::vector<Package> packages = getPackagesFromURL(url +
"/api/packages/?type=mod&type=game&type=txp&protocol_version="
LATEST_PROTOCOL_VERSION_STRING);
// Make table // Make table
lua_newtable(L); lua_newtable(L);