X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fmods.cpp;h=dae49233978c29fa01fef5378486a92af6b6f59e;hb=fd9f195fcc2e4e592dbad3290876486eb08318b2;hp=a555a5b13ca4d7c3044d1de5e9fe2a19ef8fcb8e;hpb=4faaadc8d50d6ab7a19d22bd5a760c4b8321a51f;p=minetest.git diff --git a/src/mods.cpp b/src/mods.cpp index a555a5b13..dae492339 100644 --- a/src/mods.cpp +++ b/src/mods.cpp @@ -19,14 +19,14 @@ with this program; if not, write to the Free Software Foundation, Inc., #include #include +#include #include "mods.h" #include "filesys.h" #include "log.h" #include "subgame.h" #include "settings.h" -#include "convert_json.h" -#include "exceptions.h" #include "porting.h" +#include "convert_json.h" static bool parseDependsLine(std::istream &is, std::string &dep, std::set &symbols) @@ -41,7 +41,7 @@ static bool parseDependsLine(std::istream &is, --pos; } dep = trim(dep.substr(0, pos)); - return dep != ""; + return !dep.empty(); } void parseModContents(ModSpec &spec) @@ -91,13 +91,13 @@ std::map getModsInPath(std::string path, bool part_of_modp std::map result; std::vector dirlist = fs::GetDirListing(path); - for(u32 j=0; j getModsInPath(std::string path, bool part_of_modp std::vector flattenMods(std::map mods) { std::vector result; - for(std::map::iterator it = mods.begin(); - it != mods.end(); ++it) - { - ModSpec mod = (*it).second; - if(mod.is_modpack) - { + for (const auto &it : mods) { + const ModSpec &mod = it.second; + if (mod.is_modpack) { std::vector content = flattenMods(mod.modpack_content); result.reserve(result.size() + content.size()); result.insert(result.end(),content.begin(),content.end()); @@ -131,23 +128,16 @@ std::vector flattenMods(std::map mods) return result; } -ModConfiguration::ModConfiguration(const std::string &worldpath): - m_unsatisfied_mods(), - m_sorted_mods(), - m_name_conflicts() +ModConfiguration::ModConfiguration(const std::string &worldpath) { } void ModConfiguration::printUnsatisfiedModsError() const { - for (std::vector::const_iterator it = m_unsatisfied_mods.begin(); - it != m_unsatisfied_mods.end(); ++it) { - ModSpec mod = *it; + for (const ModSpec &mod : m_unsatisfied_mods) { errorstream << "mod \"" << mod.name << "\" has unsatisfied dependencies: "; - for (std::unordered_set::iterator dep_it = - mod.unsatisfied_depends.begin(); - dep_it != mod.unsatisfied_depends.end(); ++dep_it) - errorstream << " \"" << *dep_it << "\""; + for (const std::string &unsatisfied_depend : mod.unsatisfied_depends) + errorstream << " \"" << unsatisfied_depend << "\""; errorstream << std::endl; } } @@ -175,17 +165,15 @@ void ModConfiguration::addMods(const std::vector &new_mods) std::set seen_this_iteration; - for (std::vector::const_iterator it = new_mods.begin(); - it != new_mods.end(); ++it) { - const ModSpec &mod = *it; - if(mod.part_of_modpack != (bool)want_from_modpack) + for (const ModSpec &mod : new_mods) { + if (mod.part_of_modpack != (bool)want_from_modpack) continue; - if(existing_mods.count(mod.name) == 0){ + + if (existing_mods.count(mod.name) == 0) { // GOOD CASE: completely new mod. m_unsatisfied_mods.push_back(mod); existing_mods[mod.name] = m_unsatisfied_mods.size() - 1; - } - else if(seen_this_iteration.count(mod.name) == 0){ + } else if(seen_this_iteration.count(mod.name) == 0) { // BAD CASE: name conflict in different levels. u32 oldindex = existing_mods[mod.name]; const ModSpec &oldmod = m_unsatisfied_mods[oldindex]; @@ -198,8 +186,7 @@ void ModConfiguration::addMods(const std::vector &new_mods) // If there was a "VERY BAD CASE" name conflict // in an earlier level, ignore it. m_name_conflicts.erase(mod.name); - } - else{ + } else { // VERY BAD CASE: name conflict in the same level. u32 oldindex = existing_mods[mod.name]; const ModSpec &oldmod = m_unsatisfied_mods[oldindex]; @@ -210,29 +197,27 @@ void ModConfiguration::addMods(const std::vector &new_mods) m_unsatisfied_mods[oldindex] = mod; m_name_conflicts.insert(mod.name); } + seen_this_iteration.insert(mod.name); } } } -void ModConfiguration::addModsFormConfig(const std::string &settings_path, const std::set &mods) +void ModConfiguration::addModsFromConfig(const std::string &settings_path, const std::set &mods) { Settings conf; std::set load_mod_names; conf.readConfigFile(settings_path.c_str()); std::vector names = conf.getNames(); - for (std::vector::iterator it = names.begin(); - it != names.end(); ++it) { - std::string name = *it; + for (const std::string &name : names) { if (name.compare(0,9,"load_mod_")==0 && conf.getBool(name)) load_mod_names.insert(name.substr(9)); } std::vector addon_mods; - for (std::set::const_iterator i = mods.begin(); - i != mods.end(); ++i) { - std::vector addon_mods_in_path = flattenMods(getModsInPath(*i)); + for (const std::string &i : mods) { + std::vector addon_mods_in_path = flattenMods(getModsInPath(i)); for (std::vector::const_iterator it = addon_mods_in_path.begin(); it != addon_mods_in_path.end(); ++it) { const ModSpec& mod = *it; @@ -248,18 +233,18 @@ void ModConfiguration::addModsFormConfig(const std::string &settings_path, const checkConflictsAndDeps(); // complain about mods declared to be loaded, but not found - for (std::vector::iterator it = addon_mods.begin(); - it != addon_mods.end(); ++it) - load_mod_names.erase((*it).name); - std::vector UnsatisfiedMods = getUnsatisfiedMods(); - for (std::vector::iterator it = UnsatisfiedMods.begin(); - it != UnsatisfiedMods.end(); ++it) - load_mod_names.erase((*it).name); + for (const ModSpec &addon_mod : addon_mods) + load_mod_names.erase(addon_mod.name); + + std::vector unsatisfiedMods = getUnsatisfiedMods(); + + for (const ModSpec &unsatisfiedMod : unsatisfiedMods) + load_mod_names.erase(unsatisfiedMod.name); + if (!load_mod_names.empty()) { errorstream << "The following mods could not be found:"; - for (std::set::iterator it = load_mod_names.begin(); - it != load_mod_names.end(); ++it) - errorstream << " \"" << (*it) << "\""; + for (const std::string &mod : load_mod_names) + errorstream << " \"" << mod << "\""; errorstream << std::endl; } } @@ -286,23 +271,18 @@ void ModConfiguration::resolveDependencies() { // Step 1: Compile a list of the mod names we're working with std::set modnames; - for(std::vector::iterator it = m_unsatisfied_mods.begin(); - it != m_unsatisfied_mods.end(); ++it){ - modnames.insert((*it).name); + for (const ModSpec &mod : m_unsatisfied_mods) { + modnames.insert(mod.name); } // Step 2: get dependencies (including optional dependencies) // of each mod, split mods into satisfied and unsatisfied std::list satisfied; std::list unsatisfied; - for (std::vector::iterator it = m_unsatisfied_mods.begin(); - it != m_unsatisfied_mods.end(); ++it) { - ModSpec mod = *it; + for (ModSpec mod : m_unsatisfied_mods) { mod.unsatisfied_depends = mod.depends; // check which optional dependencies actually exist - for (std::unordered_set::iterator it_optdep = mod.optdepends.begin(); - it_optdep != mod.optdepends.end(); ++it_optdep) { - std::string optdep = *it_optdep; + for (const std::string &optdep : mod.optdepends) { if (modnames.count(optdep) != 0) mod.unsatisfied_depends.insert(optdep); } @@ -319,15 +299,13 @@ void ModConfiguration::resolveDependencies() ModSpec mod = satisfied.back(); m_sorted_mods.push_back(mod); satisfied.pop_back(); - for(std::list::iterator it = unsatisfied.begin(); - it != unsatisfied.end(); ){ + for (auto it = unsatisfied.begin(); it != unsatisfied.end(); ) { ModSpec& mod2 = *it; mod2.unsatisfied_depends.erase(mod.name); - if(mod2.unsatisfied_depends.empty()){ + if (mod2.unsatisfied_depends.empty()) { satisfied.push_back(mod2); it = unsatisfied.erase(it); - } - else{ + } else { ++it; } } @@ -348,7 +326,7 @@ ServerModConfiguration::ServerModConfiguration(const std::string &worldpath): // Load normal mods std::string worldmt = worldpath + DIR_DELIM + "world.mt"; - addModsFormConfig(worldmt, gamespec.addon_mods_paths); + addModsFromConfig(worldmt, gamespec.addon_mods_paths); } #ifndef SERVER @@ -361,29 +339,10 @@ ClientModConfiguration::ClientModConfiguration(const std::string &path): paths.insert(path_user); std::string settings_path = path_user + DIR_DELIM + "mods.conf"; - addModsFormConfig(settings_path, paths); + addModsFromConfig(settings_path, paths); } #endif -#if USE_CURL -Json::Value getModstoreUrl(const std::string &url) -{ - std::vector extra_headers; - - bool special_http_header = true; - - try { - special_http_header = g_settings->getBool("modstore_disable_special_http_header"); - } catch (SettingNotFoundException) {} - - if (special_http_header) { - extra_headers.push_back("Accept: application/vnd.minetest.mmdb-v1+json"); - } - return fetchJsonValue(url, special_http_header ? &extra_headers : NULL); -} - -#endif - ModMetadata::ModMetadata(const std::string &mod_name): m_mod_name(mod_name) { @@ -416,7 +375,7 @@ bool ModMetadata::save(const std::string &root_path) } bool w_ok = fs::safeWriteToFile(root_path + DIR_DELIM + m_mod_name, - Json::FastWriter().write(json)); + fastWriteJson(json)); if (w_ok) { m_modified = false; @@ -435,19 +394,21 @@ bool ModMetadata::load(const std::string &root_path) return false; } - Json::Reader reader; Json::Value root; - if (!reader.parse(is, root)) { + Json::CharReaderBuilder builder; + builder.settings_["collectComments"] = false; + std::string errs; + + if (!Json::parseFromStream(builder, is, &root, &errs)) { errorstream << "ModMetadata[" << m_mod_name << "]: failed read data " - "(Json decoding failure)." << std::endl; + "(Json decoding failure). Message: " << errs << std::endl; return false; } const Json::Value::Members attr_list = root.getMemberNames(); - for (Json::Value::Members::const_iterator it = attr_list.begin(); - it != attr_list.end(); ++it) { - Json::Value attr_value = root[*it]; - m_stringvars[*it] = attr_value.asString(); + for (const auto &it : attr_list) { + Json::Value attr_value = root[it]; + m_stringvars[it] = attr_value.asString(); } return true;