LocalPlayer::accelerateHorizontal: cleanups

[oweals/minetest.git] / src / mods.h

diff --git a/src/mods.h b/src/mods.h
index dedcc98978ff1ceb241dba2af5f32c9e22f75af3..697fed38bb0bbd453f89357c58939da8c2ddb810 100644 (file)
--- a/src/mods.h
+++ b/src/mods.h
@@ -26,55 +26,29 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <vector>
 #include <string>
 #include <map>
-#include <exception>
-#include "json/json.h"
+#include <json/json.h>
+#include <unordered_set>
 #include "config.h"
-
-#if USE_CURL
-#include <curl/curl.h>
-#endif
+#include "metadata.h"
 
 #define MODNAME_ALLOWED_CHARS "abcdefghijklmnopqrstuvwxyz0123456789_"
 
-class ModError : public std::exception
-{
-public:
-       ModError(const std::string &s)
-       {
-               m_s = "ModError: ";
-               m_s += s;
-       }
-       virtual ~ModError() throw()
-       {}
-       virtual const char * what() const throw()
-       {
-               return m_s.c_str();
-       }
-       std::string m_s;
-};
-
 struct ModSpec
 {
        std::string name;
        std::string path;
        //if normal mod:
-       std::set<std::string> depends;
-       std::set<std::string> optdepends;
-       std::set<std::string> unsatisfied_depends;
+       std::unordered_set<std::string> depends;
+       std::unordered_set<std::string> optdepends;
+       std::unordered_set<std::string> unsatisfied_depends;
 
-       bool part_of_modpack;
-       bool is_modpack;
+       bool part_of_modpack = false;
+       bool is_modpack = false;
        // if modpack:
        std::map<std::string,ModSpec> modpack_content;
-       ModSpec(const std::string name_="", const std::string path_=""):
+       ModSpec(const std::string &name_="", const std::string &path_=""):
                name(name_),
-               path(path_),
-               depends(),
-               optdepends(),
-               unsatisfied_depends(),
-               part_of_modpack(false),
-               is_modpack(false),
-               modpack_content()
+               path(path_)
        {}
 };
 
@@ -83,12 +57,6 @@ void parseModContents(ModSpec &mod);
 
 std::map<std::string,ModSpec> getModsInPath(std::string path, bool part_of_modpack = false);
 
-// If failed, returned modspec has name==""
-ModSpec findCommonMod(const std::string &modname);
-
-// expands modpack contents, but does not replace them.
-std::map<std::string, ModSpec> flattenModTree(std::map<std::string, ModSpec> mods);
-
 // replaces modpack Modspecs with their content
 std::vector<ModSpec> flattenMods(std::map<std::string,ModSpec> mods);
 
@@ -98,17 +66,8 @@ std::vector<ModSpec> flattenMods(std::map<std::string,ModSpec> mods);
 class ModConfiguration
 {
 public:
-       ModConfiguration():
-               m_unsatisfied_mods(),
-               m_sorted_mods(),
-               m_name_conflicts()
-       {}
-
-               
-       ModConfiguration(std::string worldpath);
-
        // checks if all dependencies are fullfilled.
-       bool isConsistent()
+       bool isConsistent() const
        {
                return m_unsatisfied_mods.empty();
        }
@@ -118,19 +77,26 @@ public:
                return m_sorted_mods;
        }
 
-       std::vector<ModSpec> getUnsatisfiedMods()
+       const std::vector<ModSpec> &getUnsatisfiedMods() const
        {
                return m_unsatisfied_mods;
        }
 
-private:
+       void printUnsatisfiedModsError() const;
+
+protected:
+       ModConfiguration(const std::string &worldpath);
        // adds all mods in the given path. used for games, modpacks
        // and world-specific mods (worldmods-folders)
-       void addModsInPath(std::string path);
+       void addModsInPath(const std::string &path);
 
        // adds all mods in the set.
-       void addMods(std::vector<ModSpec> new_mods);
+       void addMods(const std::vector<ModSpec> &new_mods);
+
+       void addModsFormConfig(const std::string &settings_path, const std::set<std::string> &mods);
 
+       void checkConflictsAndDeps();
+private:
        // move mods from m_unsatisfied_mods to m_sorted_mods
        // in an order that satisfies dependencies
        void resolveDependencies();
@@ -153,16 +119,26 @@ private:
        // 1. game mod in modpack; 2. game mod;
        // 3. world mod in modpack; 4. world mod;
        // 5. addon mod in modpack; 6. addon mod.
-       std::set<std::string> m_name_conflicts;
+       std::unordered_set<std::string> m_name_conflicts;
+
+       // Deleted default constructor
+       ModConfiguration() {}
 
 };
 
-#if USE_CURL
-Json::Value getModstoreUrl(std::string url);
-#else
-inline Json::Value getModstoreUrl(std::string url) {
-       return Json::Value();
-}
+class ServerModConfiguration: public ModConfiguration
+{
+public:
+       ServerModConfiguration(const std::string &worldpath);
+
+};
+
+#ifndef SERVER
+class ClientModConfiguration: public ModConfiguration
+{
+public:
+       ClientModConfiguration(const std::string &path);
+};
 #endif
 
 struct ModLicenseInfo {
@@ -176,55 +152,24 @@ struct ModAuthorInfo {
        std::string username;
 };
 
-struct ModStoreMod {
-       int id;
-       std::string title;
-       std::string basename;
-       ModAuthorInfo author;
-       float rating;
-       bool valid;
-};
+class ModMetadata: public Metadata
+{
+public:
+       ModMetadata(const std::string &mod_name);
+       ~ModMetadata() {}
 
-struct ModStoreCategoryInfo {
-       int id;
-       std::string name;
-};
+       virtual void clear();
 
-struct ModStoreVersionEntry {
-       int id;
-       std::string date;
-       std::string file;
-       bool approved;
-       //ugly version number
-       int mtversion;
-};
+       bool save(const std::string &root_path);
+       bool load(const std::string &root_path);
 
-struct ModStoreTitlePic {
-       int id;
-       std::string file;
-       std::string description;
-       int mod;
-};
+       bool isModified() const { return m_modified; }
+       const std::string &getModName() const { return m_mod_name; }
 
-struct ModStoreModDetails {
-       /* version_set?? */
-       std::vector<ModStoreCategoryInfo> categories;
-       ModAuthorInfo author;
-       ModLicenseInfo license;
-       ModStoreTitlePic titlepic;
-       int id;
-       std::string title;
-       std::string basename;
-       std::string description;
-       std::string repository;
-       float rating;
-       std::vector<std::string> depends;
-       std::vector<std::string> softdeps;
-
-       std::string download_url;
-       std::string screenshot_url;
-       std::vector<ModStoreVersionEntry> versions;
-       bool valid;
+       virtual bool setString(const std::string &name, const std::string &var);
+private:
+       std::string m_mod_name;
+       bool m_modified = false;
 };
 
 #endif