Skip to content

Commit fcba62b

Browse files
AyutoAyuto
committed
Standardized the message prefix on the C++ side.
Fixed two messages which didn't end with a new line character. SP now fails to load if an error was raised on the python side during the loading process.
1 parent e85a596 commit fcba62b

File tree

8 files changed

+38
-21
lines changed

8 files changed

+38
-21
lines changed

‎src/core/core/sp_gamedir.cpp‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
// Includes
2929
//---------------------------------------------------------------------------------
3030
#include "sp_gamedir.h"
31+
#include "sp_main.h"
3132
#include "eiface.h"
3233
#include "strtools.h"
3334

@@ -47,7 +48,7 @@ CGamePaths g_GamePaths;
4748
bool CGamePaths::Initialize( void )
4849
{
4950
if( !engine ) {
50-
Msg("[SP] Could not initialize game paths! Engine pointer was invalid.\n");
51+
Msg(MSG_PREFIX "Could not initialize game paths! Engine pointer was invalid.\n");
5152
return false;
5253
}
5354

@@ -58,8 +59,8 @@ bool CGamePaths::Initialize( void )
5859
V_FixSlashes(m_szGameDir);
5960
V_FixSlashes(m_szSPDir);
6061

61-
DevMsg(1, "[SP] Game directory is %s\n", m_szGameDir);
62-
DevMsg(1, "[SP] Source-Python directory is %s\n", m_szSPDir);
62+
DevMsg(1, MSG_PREFIX "Game directory is %s\n", m_szGameDir);
63+
DevMsg(1, MSG_PREFIX "Source-Python directory is %s\n", m_szSPDir);
6364

6465
return true;
6566
}

‎src/core/core/sp_main.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -157,9 +157,9 @@ bool GetInterfaces( InterfaceHelper_t* pInterfaceList, CreateInterfaceFn factory
157157

158158
// If it's not valid, bail out.
159159
if( *pGlobal ) {
160-
DevMsg(1, "[SP] Interface %s at %x\n", pInterface->szInterface, *pGlobal);
160+
DevMsg(1, MSG_PREFIX "Interface %s at %x\n", pInterface->szInterface, *pGlobal);
161161
} else {
162-
Warning("[SP] Could not retrieve interface %s\n", pInterface->szInterface);
162+
Warning(MSG_PREFIX "Could not retrieve interface %s\n", pInterface->szInterface);
163163
return false;
164164
}
165165

@@ -211,13 +211,13 @@ bool CSourcePython::Load( CreateInterfaceFn interfaceFactory, CreateInterfaceFn
211211

212212
// Initialize game paths.
213213
if( !g_GamePaths.Initialize() ) {
214-
DevMsg(0, "Could not initialize game paths.");
214+
DevMsg(0, MSG_PREFIX "Could not initialize game paths.\n");
215215
return false;
216216
}
217217

218218
// Initialize python
219219
if( !g_PythonManager.Initialize() ) {
220-
DevMsg(0, "Could not initialize python.");
220+
DevMsg(0, MSG_PREFIX "Could not initialize python.\n");
221221
return false;
222222
}
223223

@@ -377,7 +377,7 @@ void CSourcePython::OnQueryCvarValueFinished( QueryCvarCookie_t iCookie, edict_t
377377
EQueryCvarValueStatus eStatus, const char *pCvarName, const char *pCvarValue )
378378
{
379379
g_AddonManager.OnQueryCvarValueFinished(iCookie, pPlayerEntity, eStatus, pCvarName, pCvarValue);
380-
DevMsg(1, "Cvar query (cookie: %d, status: %d) - name: %s, value: %s\n", iCookie, eStatus, pCvarName, pCvarValue );
380+
DevMsg(1, MSG_PREFIX "Cvar query (cookie: %d, status: %d) - name: %s, value: %s\n", iCookie, eStatus, pCvarName, pCvarValue );
381381
}
382382

383383
//-----------------------------------------------------------------------------
@@ -386,7 +386,7 @@ void CSourcePython::OnQueryCvarValueFinished( QueryCvarCookie_t iCookie, edict_t
386386
void CSourcePython::FireGameEvent( IGameEvent * event )
387387
{
388388
const char * name = event->GetName();
389-
DevMsg(1, "CSourcePython::FireGameEvent: Got event \"%s\"\n", name );
389+
DevMsg(1, MSG_PREFIX "CSourcePython::FireGameEvent: Got event \"%s\"\n", name );
390390

391391
//g_AddonManager.FireGameEvent(event);
392392
}

‎src/core/core/sp_main.h‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,13 @@
3232
#include "engine/iserverplugin.h"
3333
#include "igameevents.h"
3434

35+
36+
//---------------------------------------------------------------------------------
37+
// Definitions
38+
//---------------------------------------------------------------------------------
39+
#define MSG_PREFIX "[Source.Python] "
40+
41+
3542
//---------------------------------------------------------------------------------
3643
// Purpose: a sample 3rd party plugin class
3744
//---------------------------------------------------------------------------------

‎src/core/core/sp_python.cpp‎

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
//---------------------------------------------------------------------------------
3434
#include "sp_python.h"
3535
#include "sp_gamedir.h"
36+
#include "sp_main.h"
3637
#include "eiface.h"
3738
#include "modules/export_main.h"
3839

@@ -63,7 +64,7 @@ void AddToSysPath( const char* path )
6364
V_snprintf(szFolderPath, MAX_GAME_PATH, "%s%s", g_GamePaths.GetSPDir(), path);
6465
V_FixSlashes(szFolderPath);
6566

66-
DevMsg(1, "[SP] Adding %s to path\n", szFolderPath);
67+
DevMsg(1, MSG_PREFIX "Adding %s to path\n", szFolderPath);
6768
std::string szCommandString = "sys.path.append(r\"" + std::string(szFolderPath) + "\")";
6869
PyRun_SimpleString(szCommandString.c_str());
6970
}
@@ -77,7 +78,7 @@ bool CPythonManager::Initialize( void )
7778
char szPythonHome[MAX_GAME_PATH];
7879
V_snprintf(szPythonHome, MAX_GAME_PATH, "%s/Python3", g_GamePaths.GetSPDir());
7980
V_FixSlashes(szPythonHome);
80-
DevMsg(1, "[SP] Python home path set to %s\n", szPythonHome);
81+
DevMsg(1, MSG_PREFIX "Python home path set to %s\n", szPythonHome);
8182

8283
// Convert to wide char for python.
8384
wchar_t wszPythonHome[1024];
@@ -92,7 +93,7 @@ bool CPythonManager::Initialize( void )
9293
Py_Initialize();
9394

9495
// Print some information
95-
DevMsg(1, "Python version %s initialized!\n", Py_GetVersion());
96+
DevMsg(1, MSG_PREFIX "Python version %s initialized!\n", Py_GetVersion());
9697

9798
// Make sure sys is imported.
9899
PyRun_SimpleString("import sys");
@@ -126,15 +127,19 @@ bool CPythonManager::Initialize( void )
126127
modulsp_init();
127128

128129
// Import the main module file.
129-
DevMsg(1, "[SP] Importing main module..\n");
130-
BEGIN_BOOST_PY()
130+
DevMsg(1, MSG_PREFIX "Importing main module..\n");
131131

132+
try {
132133
python::import("__init__");
134+
}
135+
catch( ... ) {
136+
PyErr_Print();
137+
PyErr_Clear();
138+
DevMsg(0, MSG_PREFIX "Failed to load.\n");
139+
return false;
140+
}
133141

134-
END_BOOST_PY_NORET(); // Noret because we have more stuff to do after this import.
135-
136-
DevMsg(0, "[Source.Python] Loaded successfully.\n");
137-
142+
DevMsg(0, MSG_PREFIX "Loaded successfully.\n");
138143
return true;
139144
}
140145

‎src/core/modules/entities/entities_wrap.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
#include "boost/algorithm/string.hpp"
3838
#include "boost/foreach.hpp"
3939
#include "utility/wrap_macros.h"
40+
#include "core/sp_main.h"
4041

4142
//-----------------------------------------------------------------------------
4243
// If these aren't defined, we get linker errors about CBaseEdict.
@@ -192,7 +193,7 @@ CSendProp::CSendProp( edict_t* edict, const char* prop_name )
192193

193194
if( !m_edict )
194195
{
195-
DevMsg(1, "[SP]: edict was not valid!\n");
196+
DevMsg(1, MSG_PREFIX "edict was not valid!\n");
196197
return;
197198
}
198199

‎src/core/modules/export_main.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
//---------------------------------------------------------------------------------
3030
#include "boost/python.hpp"
3131
#include "core/sp_python.h"
32+
#include "core/sp_main.h"
3233
#include "export_main.h"
3334
#include "tier0/dbg.h"
3435

@@ -67,7 +68,7 @@ void modulsp_init( void )
6768
char* szModuleName = g_SourcePythonModules[i].szName;
6869

6970
// Debug info.
70-
DevMsg(1, "[SP] Initializing %s module\n", szModuleName);
71+
DevMsg(1, MSG_PREFIX "Initializing %s module\n", szModuleName);
7172

7273
// Set the new module as the current scope.
7374
object newmodule(borrowed(PyImport_AddModule(szModuleName)));

‎src/loader/loader_main.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ void* SPLoadLibrary( IVEngineServer* engine, const char* libraryPath )
156156
//---------------------------------------------------------------------------------
157157
bool CSourcePython::Load( CreateInterfaceFn interfaceFactory, CreateInterfaceFn gameServerFactory )
158158
{
159-
DevMsg(0, "[Source.Python] Loading...\n");
159+
DevMsg(0, MSG_PREFIX "Loading...\n");
160160

161161
IVEngineServer* engine = (IVEngineServer*)interfaceFactory(INTERFACEVERSION_VENGINESERVER, NULL);
162162

‎src/loader/loader_main.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,8 @@
6363
# define PYLIB_NAME PYLIB_NAME_LINUX_RELEASE
6464
#endif
6565

66+
#define MSG_PREFIX "[Source.Python] "
67+
6668
//---------------------------------------------------------------------------------
6769
// Purpose: a sample 3rd party plugin class
6870
//---------------------------------------------------------------------------------

0 commit comments

Comments
 (0)