Fixed issue #146

Author: Ayuto

addons/source-python/packages/source-python/config/manager.py

@@ -19,7 +19,7 @@
 #   Cvars
 from cvars import ConVar
 #   Engines
-from engines.server import engine_server
+from engines.server import queue_command_string
 #   Hooks
 from hooks.exceptions import except_hooks
 #   Paths
@@ -291,7 +291,7 @@ def execute(self):
                 if name in self._commands:
 
                     # Execute the line
-                    engine_server.server_command(line + '\n')
+                    queue_command_string(line)
 
                 # Is this a cvar
                 else:

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

@@ -146,13 +146,8 @@ def __init__(self, infile, *args, **kwargs):
 # =============================================================================
 def echo_console(text):
     """Echo a message to the server's console."""
-    # Import engine_server
     # This is done here to fix an ImportError
-    from engines.server import engine_server
+    from engines.server import execute_server_command
 
-    # Loop through each line in the text
     for line in text.split('\n'):
-
-        # Echo the message
-        engine_server.server_command(
-            'echo "{0}"\n'.format(line.replace('"', "'")))
+        execute_server_command('echo', '"{0}"'.format(line.replace('"', "'")))

addons/source-python/packages/source-python/core/command/__init__.py

@@ -19,7 +19,8 @@
 #   Cvars
 from cvars import ConVar
 #   Engines
-from engines.server import engine_server
+from engines.server import execute_server_command
+from engines.server import queue_command_string
 #   Paths
 from paths import SP_DATA_PATH
 #   Players
@@ -143,7 +144,7 @@ def print_credits(self):
 @_core_command.server_sub_command(['delay'])
 def _sp_delay(command_info, delay:float, command, *args):
     """Execute a command after a given delay."""
-    Delay(delay, engine_server.server_command, command + ' ' + ' '.join(args))
+    Delay(delay, queue_command_string, command + ' ' + ' '.join(args))
 
 @_core_command.server_sub_command(['version'])
 def _sp_version(command_info):
@@ -160,7 +161,7 @@ def _sp_credits(command_info):
 def _sp_help(command_info, command=None, *server_sub_commands):
     """Print all sp sub-commands or help for a specific command."""
     if command is None:
-        engine_server.server_command('sp')
+        execute_server_command('sp')
         return
 
     commands = (command,) + server_sub_commands

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

@@ -12,6 +12,9 @@
 from _engines._server import Server
 from _engines._server import engine_server
 from _engines._server import server_game_dll
+from _engines._server import execute_server_command
+from _engines._server import queue_command_string
+from _engines._server import queue_server_command
 #   Globals
 from _globals import MapLoadType
 from _globals import global_vars
@@ -26,7 +29,10 @@
            'Server',
            'server',
            'engine_server',
+           'execute_server_command',
            'global_vars',
+           'queue_command_string',
+           'queue_server_command',
            'server_game_dll',
            )
 

src/CMakeLists.txt

@@ -174,12 +174,14 @@ Set(SOURCEPYTHON_EFFECTS_MODULE_SOURCES
 # ------------------------------------------------------------------
 Set(SOURCEPYTHON_ENGINES_MODULE_HEADERS
     core/modules/engines/engines.h
+    core/modules/engines/engines_server.h
     core/modules/engines/${SOURCE_ENGINE}/engines.h
     core/modules/engines/${SOURCE_ENGINE}/engines_wrap.h
 )
 
 Set(SOURCEPYTHON_ENGINES_MODULE_SOURCES
     core/modules/engines/engines_wrap.cpp
+    core/modules/engines/engines_server.cpp
     core/modules/engines/engines_server_wrap.cpp
     core/modules/engines/engines_sound_wrap.cpp
     core/modules/engines/engines_trace_wrap.cpp

src/core/modules/engines/engines_server.cpp

@@ -0,0 +1,98 @@
+/**
+* =============================================================================
+* Source Python
+* Copyright (C) 2012-2016 Source Python Development Team.  All rights reserved.
+* =============================================================================
+*
+* This program is free software; you can redistribute it and/or modify it under
+* the terms of the GNU General Public License, version 3.0, as published by the
+* Free Software Foundation.
+*
+* This program is distributed in the hope that it will be useful, but WITHOUT
+* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+* FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+* details.
+*
+* You should have received a copy of the GNU General Public License along with
+* this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+* As a special exception, the Source Python Team gives you permission
+* to link the code of this program (as well as its derivative works) to
+* "Half-Life 2," the "Source Engine," and any Game MODs that run on software
+* by the Valve Corporation.  You must obey the GNU General Public License in
+* all respects for all other code used.  Additionally, the Source.Python
+* Development Team grants this exception to all derivative works.
+*/
+
+//-----------------------------------------------------------------------------
+// Includes.
+//-----------------------------------------------------------------------------
+// Source.Python
+#include "engines_server.h"
+#include "utilities/wrap_macros.h"
+
+// SDK
+#include "convar.h"
+#include "eiface.h"
+
+
+//-----------------------------------------------------------------------------
+// Externals
+//-----------------------------------------------------------------------------
+extern IVEngineServer* engine;
+
+
+//-----------------------------------------------------------------------------
+// Commands to execute server commands
+//-----------------------------------------------------------------------------
+void prepare_command(tuple args, dict kwargs, ConCommand** pCommandOut, std::string* szCommandOut)
+{
+	if (kwargs)
+		BOOST_RAISE_EXCEPTION(PyExc_TypeError, "Function does not accept keywords.")
+
+	const char* command = extract<const char*>(args[0]);
+	ConCommand* pCommand = cvar->FindCommand(command);
+	if (!pCommand)
+		BOOST_RAISE_EXCEPTION(PyExc_ValueError, "Unable to find command '%s'.", command);
+
+	*pCommandOut = pCommand;
+
+	*szCommandOut = "";
+	for(int i=0; i < len(args); ++i)
+	{
+		const char* temp = extract<const char*>(str(args[i]));
+		*szCommandOut += temp;
+		*szCommandOut += " ";
+	}
+}
+
+object execute_server_command(tuple args, dict kwargs)
+{
+	std::string szCommand;
+	ConCommand* pCommand;
+	prepare_command(args, kwargs, &pCommand, &szCommand);
+
+	CCommand c;
+	if (!c.Tokenize(szCommand.c_str()))
+		BOOST_RAISE_EXCEPTION(PyExc_ValueError, "Failed to tokenize '%s'.", szCommand.c_str())
+
+	pCommand->Dispatch(c);
+	return object();
+}
+
+object queue_server_command(tuple args, dict kwargs)
+{
+	std::string szCommand;
+	ConCommand* pCommand;
+	prepare_command(args, kwargs, &pCommand, &szCommand);
+	szCommand += ";";
+	engine->ServerCommand(szCommand.c_str());
+	return object();
+}
+
+void queue_command_string(const char* szCommand)
+{
+	std::string command = szCommand;
+	command += ";";
+	engine->ServerCommand(command.c_str());
+}

src/core/modules/engines/engines_server.h

@@ -0,0 +1,49 @@
+/**
+* =============================================================================
+* Source Python
+* Copyright (C) 2012-2016 Source Python Development Team.  All rights reserved.
+* =============================================================================
+*
+* This program is free software; you can redistribute it and/or modify it under
+* the terms of the GNU General Public License, version 3.0, as published by the
+* Free Software Foundation.
+*
+* This program is distributed in the hope that it will be useful, but WITHOUT
+* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+* FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+* details.
+*
+* You should have received a copy of the GNU General Public License along with
+* this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+* As a special exception, the Source Python Team gives you permission
+* to link the code of this program (as well as its derivative works) to
+* "Half-Life 2," the "Source Engine," and any Game MODs that run on software
+* by the Valve Corporation.  You must obey the GNU General Public License in
+* all respects for all other code used.  Additionally, the Source.Python
+* Development Team grants this exception to all derivative works.
+*/
+
+#ifndef _ENGINES_SERVER_H
+#define _ENGINES_SERVER_H
+
+//-----------------------------------------------------------------------------
+// Includes.
+//-----------------------------------------------------------------------------
+#include "boost/python.hpp"
+using namespace boost::python;
+
+
+//-----------------------------------------------------------------------------
+// Functions.
+//-----------------------------------------------------------------------------
+// Example: execute_server_command('echo', 'hi', 123, 4.5)
+object execute_server_command(tuple args, dict kwargs);
+
+// Example: queue_server_command('echo', 'hi', 123, 4.5)
+object queue_server_command(tuple args, dict kwargs);
+
+// Example: queue_command_string('blah hi 123 4.5')
+void queue_command_string(const char* szCommand);
+
+#endif // _ENGINES_SERVER_H

src/core/modules/engines/engines_server_wrap.cpp

@@ -32,6 +32,7 @@
 	#include <Windows.h>
 #endif
 
+#include "engines_server.h"
 #include "export_main.h"
 #include "utilities/conversions.h"
 
@@ -65,10 +66,11 @@ extern IServerGameDLL* servergamedll;
 //---------------------------------------------------------------------------------
 // Forward declarations.
 //---------------------------------------------------------------------------------
-void export_engine_server(scope);
-void export_query_cvar_status(scope);
-void export_server_game_dll(scope);
-void export_iserver(scope);
+static void export_engine_server(scope);
+static void export_query_cvar_status(scope);
+static void export_server_game_dll(scope);
+static void export_iserver(scope);
+static void export_functions(scope);
 
 
 //---------------------------------------------------------------------------------
@@ -80,13 +82,14 @@ DECLARE_SP_SUBMODULE(_engines, _server)
 	export_query_cvar_status(_server);
 	export_server_game_dll(_server);
 	export_iserver(_server);
+	export_functions(_server);
 }
 
 
 //---------------------------------------------------------------------------------
 // Exports IVEngineServer.
 //---------------------------------------------------------------------------------
-void export_engine_server(scope _server)
+static void export_engine_server(scope _server)
 {
 	// Call engine specific implementation function
 	IVEngineServer_Visitor(
@@ -248,17 +251,6 @@ void export_engine_server(scope _server)
 			args("sentence_index")
 		)
 
-		.def("server_command",
-			&IVEngineServerExt::ServerCommand,
-			"Issues a command to the command parser as if it was typed at the server console.",
-			args("command")
-		)
-
-		.def("server_execute",
-			&IVEngineServer::ServerExecute,
-			"Executes any commands currently in the command parser immediately (instead of once per frame)."
-		)
-
 		.def("client_command",
 			&IVEngineServerExt::ClientCommand,
 			"Runs a command on the client.",
@@ -555,12 +547,6 @@ void export_engine_server(scope _server)
 			args("edict", "cvar_name")
 		)
 
-		.def("insert_server_command",
-			&IVEngineServerExt::InsertServerCommand,
-			"Inserts a command into the server's command buffer.",
-			args("command_string")
-		)
-
 		.def("get_player_info",
 			&IVEngineServer::GetPlayerInfo,
 			"Fill in the player info structure for the specified player.",
@@ -777,7 +763,7 @@ void export_engine_server(scope _server)
 //---------------------------------------------------------------------------------
 // Exports EQueryCvarValueStatus.
 //---------------------------------------------------------------------------------
-void export_query_cvar_status(scope _server)
+static void export_query_cvar_status(scope _server)
 {
 	enum_<EQueryCvarValueStatus> QueryCvarStatus("QueryCvarStatus");
 
@@ -792,7 +778,7 @@ void export_query_cvar_status(scope _server)
 //-----------------------------------------------------------------------------
 // Exports IServerGameDLL.
 //-----------------------------------------------------------------------------
-void export_server_game_dll(scope _server)
+static void export_server_game_dll(scope _server)
 {
 	class_<IServerGameDLL, boost::noncopyable> ServerGameDLL("_ServerGameDLL", no_init);
 
@@ -826,7 +812,7 @@ void export_server_game_dll(scope _server)
 //-----------------------------------------------------------------------------
 // Exports IServer.
 //-----------------------------------------------------------------------------
-void export_iserver(scope _server)
+static void export_iserver(scope _server)
 {
 	class_<IConnectionlessPacketHandler, IConnectionlessPacketHandler*, boost::noncopyable> _IConnectionlessPacketHandler("ConnectionlessPacketHandler", no_init);
 
@@ -1003,3 +989,23 @@ void export_iserver(scope _server)
 
 	_IServer ADD_MEM_TOOLS(IServer)
 }
+
+
+//-----------------------------------------------------------------------------
+// Exports functions.
+//-----------------------------------------------------------------------------
+static void export_functions(scope _server)
+{
+	def("execute_server_command",
+		raw_function(execute_server_command, 1)
+	);
+
+	def("queue_server_command",
+		raw_function(queue_server_command, 1)
+	);
+
+	def("queue_command_string",
+		&queue_command_string,
+		"Queue a string for execution."
+	);
+}

src/core/sp_main.cpp

@@ -311,7 +311,7 @@ void CSourcePython::UnPause( void )
 //-----------------------------------------------------------------------------
 const char *CSourcePython::GetPluginDescription( void )
 {
-	return "Source.Python, (C) 2012-2016, Source Python Team.";
+	return "Source.Python, (C) 2012-2016, Source.Python Team.";
 }
 
 //-----------------------------------------------------------------------------