Added KeyValues.from_dict()

Author: Ayuto

src/core/modules/keyvalues/keyvalues.h

@@ -223,6 +223,76 @@ class KeyValuesExt
 
 		return result;
 	}
+
+	static boost::shared_ptr<KeyValues> from_dict(const char* name, dict source)
+	{
+		KeyValues* root = new KeyValues(name);
+		AddDict(root, source);
+		return boost::shared_ptr<KeyValues>(root, &__del__);
+	}
+
+	static void AddDict(KeyValues* key, dict source)
+	{
+		list keys = source.keys();
+		for (int i=0; i < len(keys); ++i) {
+			const char* key_name = extract<const char*>(keys[i]);
+			object value = source[key_name];
+
+			if (PyLong_Check(value.ptr())) {
+				int overflow;
+				long long_result = PyLong_AsLongAndOverflow(value.ptr(), &overflow);
+				if (overflow == 0) {
+					key->SetInt(key_name, long_result);
+					continue;
+				}
+
+				PY_LONG_LONG long_long_result = PyLong_AsLongLong(value.ptr());
+				if (long_long_result < 0) {
+					// KeyValues can't handle negative long long values.
+					BOOST_RAISE_EXCEPTION(PyExc_OverflowError, "%lli is too big.", long_long_result)
+				}
+
+				key->SetUint64(key_name, long_long_result);
+				continue;
+			}
+
+			extract<float> get_float(value);
+			if (get_float.check()) {
+				key->SetFloat(key_name, get_float());
+				continue;
+			}
+
+			extract<const char*> get_string(value);
+			if (get_string.check()) {
+				key->SetString(key_name, get_string());
+				continue;
+			}
+
+			extract<Color> get_color(value);
+			if (get_color.check()) {
+				key->SetColor(key_name, get_color());
+				continue;
+			}
+
+			extract<CPointer*> get_ptr(value);
+			if (get_ptr.check()) {
+				key->SetPtr(key_name, (void*) get_ptr()->m_ulAddr);
+				continue;
+			}
+
+			extract<dict> get_dict(value);
+			if (get_dict.check()) {
+				AddDict(key->FindKey(key_name, true), get_dict());
+				continue;
+			}
+
+			object type_name = value.attr("__class__").attr("__name__");
+			object py_value_str = str(value);
+			const char* type_name_str = extract<const char*>(type_name);
+			const char* value_str = extract<const char*>(py_value_str);
+			BOOST_RAISE_EXCEPTION(PyExc_ValueError, "Invalid type (%s) of value '%s'", type_name_str, value_str)
+		}
+	}
 };
 
 

src/core/modules/keyvalues/keyvalues_wrap.cpp

@@ -64,6 +64,8 @@ void export_keyvalues(scope _keyvalues)
 		.def("__init__", make_constructor(&KeyValuesExt::__init__4))
 		.def("__init__", make_constructor(&KeyValuesExt::__init__5))
 
+		.def("from_dict", &KeyValuesExt::from_dict).staticmethod("from_dict")
+
 		.add_property("name",
 			&KeyValues::GetName,
 			&KeyValues::SetName,