Fixed #379.

Renamed KeyValues.load_from_<file/buffer> to KeyValues.from_<file/buffer>.
Renamed KeyValues.load_from_<file/buffer>2 to KeyValues.from_<file/buffer>_in_place.
Added optional encoding/errors/uses_escaped_sequences keyword arguments to KeyValues.from_file_[in_place].
Improved KeyValues.from_buffer_in_place debugging by forwarding the name of the passed instance instead of an empty string.

Author: jordanbriere

addons/source-python/packages/source-python/core/update.py

@@ -214,7 +214,7 @@ def _apply_update_stage1_windows():
             f'start your server to apply stage 2.')
     else:
         update_logger.log_debug('Determining current VDF entry...')
-        kv = KeyValues.load_from_file(VDF_FILE)
+        kv = KeyValues.from_file(VDF_FILE)
 
         # Get the current and new entry for the VDF file
         current_entry = kv.get_string('file')

src/core/modules/keyvalues/keyvalues.h

@@ -30,9 +30,13 @@
 //-----------------------------------------------------------------------------
 // Includes.
 //-----------------------------------------------------------------------------
+// SDK
 #include "tier1/KeyValues.h"
 #include "filesystem.h"
 
+// Source.Python
+#include "modules/filesystem/filesystem.h"
+
 
 //---------------------------------------------------------------------------------
 // External variables.
@@ -106,23 +110,47 @@ class KeyValuesExt
 	static void SetBool(KeyValues* pKeyValues, const char * szName, bool bValue)
 	{ pKeyValues->SetInt(szName, bValue); }
 
-	static boost::shared_ptr<KeyValues> LoadFromFile(const char * szFile)
-	{ 
+	static boost::shared_ptr<KeyValues> FromFile(const char *szFile, const char *szEncoding = "utf-8", const char *szErrors = "strict", bool bUsesEscapeSequences = false)
+	{
 		KeyValues* pKeyValues = new KeyValues("");
-		if (!pKeyValues->LoadFromFile(filesystem, szFile)) {
+		pKeyValues->UsesEscapeSequences(bUsesEscapeSequences);
+
+		try {
+			FromFileInPlace(pKeyValues, szFile, szEncoding, szErrors);
+		}
+		catch (error_already_set &) {
 			pKeyValues->deleteThis();
-			BOOST_RAISE_EXCEPTION(PyExc_ValueError, "Failed to load from file.")
-			return NULL;
+			throw_error_already_set();
 		}
+
 		return boost::shared_ptr<KeyValues>(pKeyValues, &__del__);
 	}
-	
-	static bool LoadFromFile2(KeyValues* pKeyValues, const char * szFile)
-	{ 
-		return pKeyValues->LoadFromFile(filesystem, szFile);
+
+	static bool FromFileInPlace(KeyValues* pKeyValues, const char *szFile, const char *szEncoding = "utf-8", const char *szErrors = "strict")
+	{
+		SourceFile *pFile = SourceFile::Open(szFile, "rb");
+
+		bool bResult;
+		try {
+			object content = object(handle<>(pFile->Read(-1))).attr("decode")(szEncoding, szErrors);
+			bResult = KeyValuesExt::FromBufferInPlace(pKeyValues, extract<const char *>(content));
+		}
+		catch (error_already_set &) {
+			bResult = false;
+		}
+
+		pFile->Close();
+		delete pFile;
+
+		if (PyErr_Occurred())
+			throw_error_already_set();
+		else if (!bResult)
+			BOOST_RAISE_EXCEPTION(PyExc_ValueError, "Failed to load from file.")
+
+		return bResult;
 	}
 
-	static boost::shared_ptr<KeyValues> LoadFromBuffer(const char * buffer)
+	static boost::shared_ptr<KeyValues> FromBuffer(const char * buffer)
 	{ 
 		KeyValues* pKeyValues = new KeyValues("");
 		if (!pKeyValues->LoadFromBuffer("", buffer, filesystem)) {
@@ -133,9 +161,9 @@ class KeyValuesExt
 		return boost::shared_ptr<KeyValues>(pKeyValues, &__del__);
 	}
 
-	static bool LoadFromBuffer2(KeyValues* pKeyValues, const char * buffer)
+	static bool FromBufferInPlace(KeyValues* pKeyValues, const char * buffer)
 	{ 
-		return pKeyValues->LoadFromBuffer("", buffer, filesystem);
+		return pKeyValues->LoadFromBuffer(pKeyValues->GetName(), buffer, filesystem);
 	}
 
 	static bool SaveToFile(KeyValues* pKeyValues, const char * szFile)

src/core/modules/keyvalues/keyvalues_wrap.cpp

@@ -118,26 +118,26 @@ void export_keyvalues(scope _keyvalues)
 			(arg("uses_escape_sequences"))
 		)
 
-		.def("load_from_file",
-			&KeyValuesExt::LoadFromFile,
+		.def("from_file",
+			&KeyValuesExt::FromFile,
 			"Load KeyValues data from a file and return a new KeyValues instance on success.",
-			(arg("file_name"))
-		).staticmethod("load_from_file")
+			(arg("file_name"), arg("encoding")="utf-8", arg("errors")="strict", arg("uses_escape_sequences")=false)
+		).staticmethod("from_file")
 
-		.def("load_from_file2",
-			&KeyValuesExt::LoadFromFile2,
+		.def("from_file_in_place",
+			&KeyValuesExt::FromFileInPlace,
 			"Load KeyValues data from a file into an existing KeyValues instance.",
-			(arg("file_name"))
+			(arg("file_name"), arg("encoding")="utf-8", arg("errors")="strict")
 		)
 
-		.def("load_from_buffer",
-			&KeyValuesExt::LoadFromBuffer,
+		.def("from_buffer",
+			&KeyValuesExt::FromBuffer,
 			"Load KeyValues data from a buffer and return a new KeyValues instance on success.",
 			(arg("buffer"))
-		).staticmethod("load_from_buffer")
+		).staticmethod("from_buffer")
 
-		.def("load_from_buffer2",
-			&KeyValuesExt::LoadFromBuffer2,
+		.def("from_buffer_in_place",
+			&KeyValuesExt::FromBufferInPlace,
 			"Load KeyValues data from a buffer into an existing KeyValues instance.",
 			(arg("buffer"))
 		)