]> git.lizzy.rs Git - dragonfireclient.git/blobdiff - src/serverlist.cpp
Fix formspec list spacing (#10861)
[dragonfireclient.git] / src / serverlist.cpp
index cc38ec8ce5889dd440689536eec5bb5be14f2b02..3bcab3d58ae4c35575becb6c5e95ca72b32bc025 100644 (file)
@@ -17,184 +17,19 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#include <fstream>
 #include <iostream>
-#include <sstream>
-#include <algorithm>
-
 #include "version.h"
 #include "settings.h"
 #include "serverlist.h"
 #include "filesys.h"
-#include "porting.h"
 #include "log.h"
 #include "network/networkprotocol.h"
 #include <json/json.h>
 #include "convert_json.h"
 #include "httpfetch.h"
-#include "util/string.h"
 
 namespace ServerList
 {
-
-std::string getFilePath()
-{
-       std::string serverlist_file = g_settings->get("serverlist_file");
-
-       std::string dir_path = "client" DIR_DELIM "serverlist" DIR_DELIM;
-       fs::CreateDir(porting::path_user + DIR_DELIM  "client");
-       fs::CreateDir(porting::path_user + DIR_DELIM + dir_path);
-       return porting::path_user + DIR_DELIM + dir_path + serverlist_file;
-}
-
-
-std::vector<ServerListSpec> getLocal()
-{
-       std::string path = ServerList::getFilePath();
-       std::string liststring;
-       if (fs::PathExists(path)) {
-               std::ifstream istream(path.c_str());
-               if (istream.is_open()) {
-                       std::ostringstream ostream;
-                       ostream << istream.rdbuf();
-                       liststring = ostream.str();
-                       istream.close();
-               }
-       }
-
-       return deSerialize(liststring);
-}
-
-
-std::vector<ServerListSpec> getOnline()
-{
-       std::ostringstream geturl;
-
-       u16 proto_version_min = g_settings->getFlag("send_pre_v25_init") ?
-               CLIENT_PROTOCOL_VERSION_MIN_LEGACY : CLIENT_PROTOCOL_VERSION_MIN;
-
-       geturl << g_settings->get("serverlist_url") <<
-               "/list?proto_version_min=" << proto_version_min <<
-               "&proto_version_max=" << CLIENT_PROTOCOL_VERSION_MAX;
-       Json::Value root = fetchJsonValue(geturl.str(), NULL);
-
-       std::vector<ServerListSpec> server_list;
-
-       if (!root.isObject()) {
-               return server_list;
-       }
-
-       root = root["list"];
-       if (!root.isArray()) {
-               return server_list;
-       }
-
-       for (unsigned int i = 0; i < root.size(); i++) {
-               if (root[i].isObject()) {
-                       server_list.push_back(root[i]);
-               }
-       }
-
-       return server_list;
-}
-
-
-// Delete a server from the local favorites list
-bool deleteEntry(const ServerListSpec &server)
-{
-       std::vector<ServerListSpec> serverlist = ServerList::getLocal();
-       for (std::vector<ServerListSpec>::iterator it = serverlist.begin();
-                       it != serverlist.end();) {
-               if ((*it)["address"] == server["address"] &&
-                               (*it)["port"] == server["port"]) {
-                       it = serverlist.erase(it);
-               } else {
-                       ++it;
-               }
-       }
-
-       std::string path = ServerList::getFilePath();
-       std::ostringstream ss(std::ios_base::binary);
-       ss << ServerList::serialize(serverlist);
-       if (!fs::safeWriteToFile(path, ss.str()))
-               return false;
-       return true;
-}
-
-// Insert a server to the local favorites list
-bool insert(const ServerListSpec &server)
-{
-       // Remove duplicates
-       ServerList::deleteEntry(server);
-
-       std::vector<ServerListSpec> serverlist = ServerList::getLocal();
-
-       // Insert new server at the top of the list
-       serverlist.insert(serverlist.begin(), server);
-
-       std::string path = ServerList::getFilePath();
-       std::ostringstream ss(std::ios_base::binary);
-       ss << ServerList::serialize(serverlist);
-       if (!fs::safeWriteToFile(path, ss.str()))
-               return false;
-
-       return true;
-}
-
-std::vector<ServerListSpec> deSerialize(const std::string &liststring)
-{
-       std::vector<ServerListSpec> serverlist;
-       std::istringstream stream(liststring);
-       std::string line, tmp;
-       while (std::getline(stream, line)) {
-               std::transform(line.begin(), line.end(), line.begin(), ::toupper);
-               if (line == "[SERVER]") {
-                       ServerListSpec server;
-                       std::getline(stream, tmp);
-                       server["name"] = tmp;
-                       std::getline(stream, tmp);
-                       server["address"] = tmp;
-                       std::getline(stream, tmp);
-                       server["port"] = tmp;
-                       std::getline(stream, tmp);
-                       server["description"] = tmp;
-                       serverlist.push_back(server);
-               }
-       }
-       return serverlist;
-}
-
-const std::string serialize(const std::vector<ServerListSpec> &serverlist)
-{
-       std::string liststring;
-       for (std::vector<ServerListSpec>::const_iterator it = serverlist.begin();
-                       it != serverlist.end();
-                       ++it) {
-               liststring += "[server]\n";
-               liststring += (*it)["name"].asString() + '\n';
-               liststring += (*it)["address"].asString() + '\n';
-               liststring += (*it)["port"].asString() + '\n';
-               liststring += (*it)["description"].asString() + '\n';
-               liststring += '\n';
-       }
-       return liststring;
-}
-
-const std::string serializeJson(const std::vector<ServerListSpec> &serverlist)
-{
-       Json::Value root;
-       Json::Value list(Json::arrayValue);
-       for (std::vector<ServerListSpec>::const_iterator it = serverlist.begin();
-                       it != serverlist.end();
-                       ++it) {
-               list.append(*it);
-       }
-       root["list"] = list;
-       Json::FastWriter writer;
-       return writer.write(root);
-}
-
-
 #if USE_CURL
 void sendAnnounce(AnnounceAction action,
                const u16 port,
@@ -231,12 +66,11 @@ void sendAnnounce(AnnounceAction action,
                server["clients"]      = (int) clients_names.size();
                server["clients_max"]  = g_settings->getU16("max_users");
                server["clients_list"] = Json::Value(Json::arrayValue);
-               for (std::vector<std::string>::const_iterator it = clients_names.begin();
-                               it != clients_names.end();
-                               ++it) {
-                       server["clients_list"].append(*it);
+               for (const std::string &clients_name : clients_names) {
+                       server["clients_list"].append(clients_name);
                }
-               if (gameid != "") server["gameid"] = gameid;
+               if (!gameid.empty())
+                       server["gameid"] = gameid;
        }
 
        if (action == AA_START) {
@@ -246,24 +80,29 @@ void sendAnnounce(AnnounceAction action,
                server["privs"]             = g_settings->get("default_privs");
                server["can_see_far_names"] = g_settings->getS16("player_transfer_distance") <= 0;
                server["mods"]              = Json::Value(Json::arrayValue);
-               for (std::vector<ModSpec>::const_iterator it = mods.begin();
-                               it != mods.end(); ++it) {
-                       server["mods"].append(it->name);
+               for (const ModSpec &mod : mods) {
+                       server["mods"].append(mod.name);
                }
-               actionstream << "Announcing to " << g_settings->get("serverlist_url") << std::endl;
        } else if (action == AA_UPDATE) {
                if (lag)
                        server["lag"] = lag;
        }
 
-       Json::FastWriter writer;
+       if (action == AA_START) {
+               actionstream << "Announcing " << aa_names[action] << " to " <<
+                       g_settings->get("serverlist_url") << std::endl;
+       } else {
+               infostream << "Announcing " << aa_names[action] << " to " <<
+                       g_settings->get("serverlist_url") << std::endl;
+       }
+
        HTTPFetchRequest fetch_request;
        fetch_request.url = g_settings->get("serverlist_url") + std::string("/announce");
-       fetch_request.post_fields["json"] = writer.write(server);
+       fetch_request.method = HTTP_POST;
+       fetch_request.fields["json"] = fastWriteJson(server);
        fetch_request.multipart = true;
        httpfetch_async(fetch_request);
 }
 #endif
 
 } // namespace ServerList
-