Added insert_server_command() and insert_command_string()

Author: Ayuto

addons/source-python/packages/source-python/engines/server.py

@@ -15,6 +15,8 @@
 from _engines._server import execute_server_command
 from _engines._server import queue_command_string
 from _engines._server import queue_server_command
+from _engines._server import insert_command_string
+from _engines._server import insert_server_command
 #   Globals
 from _globals import MapLoadType
 from _globals import global_vars
@@ -33,6 +35,8 @@
            'global_vars',
            'queue_command_string',
            'queue_server_command',
+           'insert_command_string',
+           'insert_server_command',
            'server_game_dll',
            )
 

src/core/modules/engines/engines_server.cpp

@@ -107,3 +107,20 @@ void queue_command_string(const char* szCommand)
 	command += ";";
 	engine->ServerCommand(command.c_str());
 }
+
+object insert_server_command(tuple args, dict kwargs)
+{
+	std::string szCommand;
+	ConCommand* pCommand;
+	prepare_command(args, kwargs, &pCommand, &szCommand);
+	szCommand += ";";
+	engine->InsertServerCommand(szCommand.c_str());
+	return object();
+}
+
+void insert_command_string(const char* szCommand)
+{
+	std::string command = szCommand;
+	command += ";";
+	engine->InsertServerCommand(command.c_str());
+}

src/core/modules/engines/engines_server.h

@@ -60,4 +60,10 @@ object queue_server_command(tuple args, dict kwargs);
 // Example: queue_command_string('blah hi 123 4.5')
 void queue_command_string(const char* szCommand);
 
+// Example: insert_server_command('echo', 'hi', 123, 4.5)
+object insert_server_command(tuple args, dict kwargs);
+
+// Example: insert_command_string('blah hi 123 4.5')
+void insert_command_string(const char* szCommand);
+
 #endif // _ENGINES_SERVER_H

src/core/modules/engines/engines_server_wrap.cpp

@@ -1049,16 +1049,34 @@ static void export_functions(scope _server)
 		":param str command: Command to execute.\n"
 		":param *args: Additional arguments that should be passed to the command.\n"
 		":raise TypeError: Raised if keyword arguments have been passed.\n"
-		":raise ValueError: Raised if the command has not been found or if the command couldn't be tokenized.";
+		":raise ValueError: Raised if the server command was not found or if the command couldn't be tokenized.";
+
 
 	def("queue_server_command",
 		raw_function(queue_server_command, 1)
 	);
-	_server.attr("queue_server_command").attr("__doc__") = "Same as :func:`execute_server_command`, but does not execute the server command immediately. "
-		"Instead it is added to the server command queue. Thus, it can be executed with a little delay.";
+	_server.attr("queue_server_command").attr("__doc__") =
+		"Same as :func:`execute_server_command`, but does not execute the server command immediately. "
+		"Instead it is added to the server command queue. Thus, it can be executed with a little delay.\n\n"
+		":raise ValueError: Raised if the server command was not found.";
+
 
 	def("queue_command_string",
 		&queue_command_string,
-		"Adds a string to the server command queue. It's the same like typing something into the server console."
+		"Adds a string to the end of the server command queue. It's the same like typing something into the server console."
+	);
+
+
+	def("insert_server_command",
+		raw_function(insert_server_command, 1)
+	);
+	_server.attr("insert_server_command").attr("__doc__") =
+		"Same as :func:`queue_server_command`, but inserts the command at the beginning of the server command queue.\n\n"
+		":raise ValueError: Raised if the server command was not found.";
+
+
+	def("insert_command_string",
+		&insert_command_string,
+		"Same like :func:`queue_command_string`, but inserts the command at the beginning of the server command queue."
 	);
 }