X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fmetadata.cpp;h=453ac1c9adc905d7193415ce588f321a0fb80fa5;hb=cef016d393959e989df259aeacd055fc702a55ca;hp=8e04aa2d35a0b41638bce7d861dae1c5e17301eb;hpb=bbdd869d72d7b5aae2994d287f69e1c1d866f4e2;p=dragonfireclient.git

diff --git a/src/metadata.cpp b/src/metadata.cpp
index 8e04aa2d3..453ac1c9a 100644
--- a/src/metadata.cpp
+++ b/src/metadata.cpp
@@ -18,10 +18,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 */
 
 #include "metadata.h"
-#include "exceptions.h"
-#include "gamedef.h"
 #include "log.h"
-#include <sstream>
 
 /*
 	Metadata
@@ -30,40 +27,89 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 void Metadata::clear()
 {
 	m_stringvars.clear();
+	m_modified = true;
 }
 
 bool Metadata::empty() const
 {
-	return m_stringvars.size() == 0;
+	return m_stringvars.empty();
 }
 
-std::string Metadata::getString(const std::string &name,
-	u16 recursion) const
+size_t Metadata::size() const
+{
+	return m_stringvars.size();
+}
+
+bool Metadata::contains(const std::string &name) const
+{
+	return m_stringvars.find(name) != m_stringvars.end();
+}
+
+bool Metadata::operator==(const Metadata &other) const
+{
+	if (size() != other.size())
+		return false;
+
+	for (const auto &sv : m_stringvars) {
+		if (!other.contains(sv.first) || other.getString(sv.first) != sv.second)
+			return false;
+	}
+
+	return true;
+}
+
+const std::string &Metadata::getString(const std::string &name, u16 recursion) const
 {
 	StringMap::const_iterator it = m_stringvars.find(name);
-	if (it == m_stringvars.end())
-		return "";
+	if (it == m_stringvars.end()) {
+		static const std::string empty_string = std::string("");
+		return empty_string;
+	}
 
 	return resolveString(it->second, recursion);
 }
 
-void Metadata::setString(const std::string &name, const std::string &var)
+bool Metadata::getStringToRef(
+		const std::string &name, std::string &str, u16 recursion) const
+{
+	StringMap::const_iterator it = m_stringvars.find(name);
+	if (it == m_stringvars.end()) {
+		return false;
+	}
+
+	str = resolveString(it->second, recursion);
+	return true;
+}
+
+/**
+ * Sets var to name key in the metadata storage
+ *
+ * @param name
+ * @param var
+ * @return true if key-value pair is created or changed
+ */
+bool Metadata::setString(const std::string &name, const std::string &var)
 {
 	if (var.empty()) {
 		m_stringvars.erase(name);
-	} else {
-		m_stringvars[name] = var;
+		return true;
+	}
+
+	StringMap::iterator it = m_stringvars.find(name);
+	if (it != m_stringvars.end() && it->second == var) {
+		return false;
 	}
+
+	m_stringvars[name] = var;
+	m_modified = true;
+	return true;
 }
 
-std::string Metadata::resolveString(const std::string &str,
-	u16 recursion) const
+const std::string &Metadata::resolveString(const std::string &str, u16 recursion) const
 {
-	if (recursion > 1) {
-		return str;
-	}
-	if (str.substr(0, 2) == "${" && str[str.length() - 1] == '}') {
+	if (recursion <= 1 && str.substr(0, 2) == "${" && str[str.length() - 1] == '}') {
 		return getString(str.substr(2, str.length() - 3), recursion + 1);
 	}
+
 	return str;
 }