sourcemm/concommands.cpp
changeset 346 d0868271663a
parent 345 600e30820ea7
     1.1 --- a/sourcemm/concommands.cpp	Mon Jul 23 18:19:02 2007 +0000
     1.2 +++ b/sourcemm/concommands.cpp	Fri Aug 10 23:43:16 2007 +0000
     1.3 @@ -15,6 +15,9 @@
     1.4  #include "sh_string.h"
     1.5  #include "sh_list.h"
     1.6  
     1.7 +using namespace SourceMM;
     1.8 +using namespace SourceHook;
     1.9 +
    1.10  /**
    1.11   * @brief Console Command Implementations
    1.12   * @file concommands.cpp
    1.13 @@ -50,7 +53,7 @@
    1.14  
    1.15  void SMConVarAccessor::MarkCommandsAsGameDLL()
    1.16  {
    1.17 -	for (SourceHook::List<ConCommandBase*>::iterator iter = m_RegisteredCommands.begin();
    1.18 +	for (List<ConCommandBase*>::iterator iter = m_RegisteredCommands.begin();
    1.19  		iter != m_RegisteredCommands.end(); ++iter)
    1.20  	{
    1.21  		(*iter)->AddFlags(FCVAR_GAMEDLL);
    1.22 @@ -61,8 +64,8 @@
    1.23  {
    1.24  	/* Notify via IMetamodListener */
    1.25  	PluginIter iter;
    1.26 -	SourceMM::CPluginManager::CPlugin *pPlugin;
    1.27 -	SourceHook::List<IMetamodListener *>::iterator event;
    1.28 +	CPluginManager::CPlugin *pPlugin;
    1.29 +	List<IMetamodListener *>::iterator event;
    1.30  	IMetamodListener *pML;
    1.31  	for (iter=g_PluginMngr._begin(); iter!=g_PluginMngr._end(); iter++)
    1.32  	{
    1.33 @@ -217,65 +220,63 @@
    1.34  
    1.35  			return;
    1.36  		} else if (strcmp(command, "list") == 0) {
    1.37 -			SourceMM::CPluginManager::CPlugin *pl;
    1.38 +			CPluginManager::CPlugin *pl;
    1.39 +			ISmmPlugin *plapi;
    1.40 +			const char *plname;
    1.41  			PluginIter i;
    1.42 -			const char *status="";
    1.43 -			const char *version=NULL;
    1.44 -			const char *name=NULL;
    1.45 -			const char *author=NULL;
    1.46 +			char buffer[256];
    1.47 +			int len;
    1.48 +			int plnum = g_PluginMngr.GetPluginCount();
    1.49  
    1.50 -			CONMSG("-Id- %-20.19s  %-10.9s  %-20.19s %-8.7s\n", "Name", "Version", "Author", "Status");
    1.51 -			for (i=g_PluginMngr._begin(); i!=g_PluginMngr._end(); i++)
    1.52 +			if (!plnum)
    1.53 +			{
    1.54 +				CONMSG("No plugins loaded.\n");
    1.55 +				return;
    1.56 +			} else {
    1.57 +				CONMSG("Listing %d plugin%s:\n", plnum, (plnum > 1) ? "s" : "");
    1.58 +			}
    1.59 +
    1.60 +			for (i = g_PluginMngr._begin(); i != g_PluginMngr._end(); i++)
    1.61  			{
    1.62  				pl = (*i);
    1.63  				if (!pl)
    1.64 -					break;
    1.65 -				if (pl->m_Status == Pl_Paused)
    1.66  				{
    1.67 -					status = "PAUSE";
    1.68 -				} else if (pl->m_Status == Pl_Running) {
    1.69 -					if (pl->m_API && pl->m_API->QueryRunning(NULL, 0))
    1.70 -						status = "RUN";
    1.71 -					else
    1.72 -						status = "STOPPED";
    1.73 -				} else if (pl->m_Status == Pl_Refused) {
    1.74 -					status = "FAIL";
    1.75 -				} else if (pl->m_Status == Pl_Error) {
    1.76 -					status = "ERROR";
    1.77 -				} else if (pl->m_Status == Pl_NotFound) {
    1.78 -					status = "NOFILE";
    1.79 +					break;
    1.80 +				}
    1.81 +
    1.82 +				len = 0;
    1.83 +
    1.84 +				if (pl->m_Status != Pl_Running)
    1.85 +				{
    1.86 +					len += UTIL_Format(buffer, sizeof(buffer), "  [%02d] <%s>", pl->m_Id, g_PluginMngr.GetStatusText(pl));
    1.87 +				} else {
    1.88 +					len += UTIL_Format(buffer, sizeof(buffer), "  [%02d]", pl->m_Id);
    1.89  				}
    1.90  
    1.91 -				if (pl->m_API)
    1.92 +				if ((plapi = pl->m_API))
    1.93  				{
    1.94 -					version = pl->m_API->GetVersion();
    1.95 -					author = pl->m_API->GetAuthor();
    1.96 -					name = pl->m_API->GetName();
    1.97 -				} else {
    1.98 -					version = "-";
    1.99 -					author = "-";
   1.100 -					name = "-";
   1.101 +					plname = IS_STR_FILLED(plapi->GetName()) ? plapi->GetName() : pl->m_File.c_str();
   1.102 +					len += UTIL_Format(&buffer[len], sizeof(buffer)-len, " %s", plname);
   1.103 +
   1.104 +					if (IS_STR_FILLED(plapi->GetVersion()))
   1.105 +					{
   1.106 +						len += UTIL_Format(&buffer[len], sizeof(buffer)-len, " (%s)", plapi->GetVersion());
   1.107 +					}
   1.108 +					if (IS_STR_FILLED(plapi->GetAuthor()))
   1.109 +					{
   1.110 +						UTIL_Format(&buffer[len], sizeof(buffer)-len, " by %s", plapi->GetAuthor());
   1.111 +					}
   1.112  				}
   1.113  
   1.114 -				if (!version)
   1.115 -					version = "-";
   1.116 -				if (!author)
   1.117 -					author = "-";
   1.118 -				if (!name)
   1.119 -					name = pl->m_File.c_str();
   1.120 -
   1.121 -
   1.122 -				CONMSG("[%02d] %-20.19s  %-10.9s  %-20.19s %-8.7s\n", pl->m_Id, name, version, author, status);
   1.123 +				CONMSG("%s\n", buffer);
   1.124  			}
   1.125  
   1.126 -			//CONMSG("\n");
   1.127 -
   1.128  			return;
   1.129  		} else if (strcmp(command, "cmds") == 0) {
   1.130  			if (args >= 3)
   1.131  			{
   1.132  				int id = atoi(e->Cmd_Argv(2));
   1.133 -				SourceMM::CPluginManager::CPlugin *pl = g_PluginMngr.FindById(id);
   1.134 +				CPluginManager::CPlugin *pl = g_PluginMngr.FindById(id);
   1.135  
   1.136  				if (!pl)
   1.137  				{
   1.138 @@ -288,7 +289,7 @@
   1.139  					CONMSG("Plugin %d is not loaded.\n", id);
   1.140  				} else {
   1.141  					CONMSG("Console commands for %s:\n", pl->m_API->GetName());
   1.142 -					SourceHook::List<ConCommandBase *>::iterator ci;
   1.143 +					List<ConCommandBase *>::iterator ci;
   1.144  					size_t count = 0;
   1.145  
   1.146  					for (ci=pl->m_Cmds.begin(); ci!=pl->m_Cmds.end(); ci++)
   1.147 @@ -306,7 +307,7 @@
   1.148  			if (args >= 3)
   1.149  			{
   1.150  				int id = atoi(e->Cmd_Argv(2));
   1.151 -				SourceMM::CPluginManager::CPlugin *pl = g_PluginMngr.FindById(id);
   1.152 +				CPluginManager::CPlugin *pl = g_PluginMngr.FindById(id);
   1.153  
   1.154  				if (!pl)
   1.155  				{
   1.156 @@ -319,7 +320,7 @@
   1.157  					CONMSG("Plugin %d is not loaded.\n", id);
   1.158  				} else {
   1.159  					CONMSG("Registered cvars for %s:\n", pl->m_API->GetName());
   1.160 -					SourceHook::List<ConCommandBase *>::iterator ci;
   1.161 +					List<ConCommandBase *>::iterator ci;
   1.162  					size_t count = 0;
   1.163  
   1.164  					for (ci=pl->m_Cvars.begin(); ci!=pl->m_Cvars.end(); ci++)
   1.165 @@ -337,7 +338,7 @@
   1.166  			if (args >= 3)
   1.167  			{
   1.168  				int id = atoi(e->Cmd_Argv(2));
   1.169 -				SourceMM::CPluginManager::CPlugin *pl = g_PluginMngr.FindById(id);
   1.170 +				CPluginManager::CPlugin *pl = g_PluginMngr.FindById(id);
   1.171  				if (!pl)
   1.172  				{
   1.173  					CONMSG("Plugin %d not found.\n", id);
   1.174 @@ -446,7 +447,7 @@
   1.175  
   1.176  				char error[255]={0};
   1.177  				bool already;
   1.178 -				SourceMM::CPluginManager::CPlugin *pl;
   1.179 +				CPluginManager::CPlugin *pl;
   1.180  
   1.181  				PluginId id = g_PluginMngr.Load(full_path, Pl_Console, already, error, sizeof(error));
   1.182  				pl = g_PluginMngr.FindById(id);
   1.183 @@ -493,8 +494,8 @@
   1.184  					CONMSG("Alias \"%s\" was not found.\n", alias);
   1.185  				}
   1.186  			} else {
   1.187 -				SourceHook::List<SourceMM::CNameAlias *>::iterator iter, end;
   1.188 -				SourceMM::CNameAlias *p;
   1.189 +				List<CNameAlias *>::iterator iter, end;
   1.190 +				CNameAlias *p;
   1.191  
   1.192  				iter = g_PluginMngr._alias_begin();
   1.193  				end = g_PluginMngr._alias_end();
   1.194 @@ -547,8 +548,8 @@
   1.195  						g_SmmAPI.PathFormat(full_path, sizeof(full_path), "%s/%s%s", g_ModPath.c_str(), file, ext);
   1.196  					}
   1.197  
   1.198 -					SourceHook::List<SourceMM::CPluginManager::CPlugin *>::iterator iter, end;
   1.199 -					SourceMM::CPluginManager::CPlugin *pl;
   1.200 +					List<CPluginManager::CPlugin *>::iterator iter, end;
   1.201 +					CPluginManager::CPlugin *pl;
   1.202  					iter = g_PluginMngr._begin();
   1.203  					end = g_PluginMngr._end();
   1.204  					for (; iter!=end; iter++)
   1.205 @@ -729,43 +730,47 @@
   1.206  
   1.207  				RETURN_META(MRES_SUPERCEDE);
   1.208  			} else if(strcmp(subcmd, "list") == 0) {
   1.209 -				SourceMM::CPluginManager::CPlugin *pl;
   1.210 -				Pl_Status st;
   1.211 +				CPluginManager::CPlugin *pl;
   1.212 +				ISmmPlugin *plapi;
   1.213 +				const char *plname;
   1.214  				PluginIter i;
   1.215 -				const char *version = NULL;
   1.216 -				const char *name = NULL;
   1.217 -				const char *author = NULL;
   1.218 -				const char *status = NULL;
   1.219 +				char buffer[256];
   1.220 +				int len = 0;
   1.221 +				int plnum = 0;
   1.222  
   1.223 -				CLIENT_CONMSG(client, "-Id- %-20.19s  %-10.9s  %-20.19s  %6s\n", "Name", "Version", "Author", "Status");
   1.224 -
   1.225 -				for (i=g_PluginMngr._begin(); i!=g_PluginMngr._end(); i++)
   1.226 +				for (i = g_PluginMngr._begin(); i != g_PluginMngr._end(); i++, len=0)
   1.227  				{
   1.228  					pl = (*i);
   1.229 -					if (!pl)
   1.230 -						break;
   1.231 -					
   1.232 -					st = pl->m_Status;
   1.233 -
   1.234 -					/* Only show plugins that are running or paused */
   1.235 -					if (pl->m_API && (st == Pl_Running || st == Pl_Paused))
   1.236 +					if (pl && pl->m_Status == Pl_Running)
   1.237  					{
   1.238 -						version = pl->m_API->GetVersion();
   1.239 -						author = pl->m_API->GetAuthor();
   1.240 -						name = pl->m_API->GetName();
   1.241 +						plapi = pl->m_API;
   1.242 +						if (!plapi || !plapi->QueryRunning(NULL, 0))
   1.243 +						{
   1.244 +							continue;
   1.245 +						}
   1.246 +						plnum++;
   1.247 +
   1.248 +						len += UTIL_Format(buffer, sizeof(buffer), "  [%02d]", plnum);
   1.249  
   1.250 -						if (st == Pl_Running && pl->m_API->QueryRunning(NULL, 0))
   1.251 +						plname = IS_STR_FILLED(plapi->GetName()) ? plapi->GetName() : pl->m_File.c_str();
   1.252 +						len += UTIL_Format(&buffer[len], sizeof(buffer)-len, " %s", plname);
   1.253 +
   1.254 +						if (IS_STR_FILLED(plapi->GetVersion()))
   1.255  						{
   1.256 -							status = "RUN";
   1.257 -						} else {
   1.258 -							status = "PAUSE";
   1.259 +							len += UTIL_Format(&buffer[len], sizeof(buffer)-len, " (%s)", plapi->GetVersion());
   1.260 +						}
   1.261 +						if (IS_STR_FILLED(plapi->GetAuthor()))
   1.262 +						{
   1.263 +							UTIL_Format(&buffer[len], sizeof(buffer)-len, " by %s", plapi->GetAuthor());
   1.264  						}
   1.265  
   1.266 -						if (!version || !author || !name)
   1.267 -							break;
   1.268 +						CLIENT_CONMSG(client, "%s\n", buffer);
   1.269 +					}
   1.270 +				}
   1.271  
   1.272 -						CLIENT_CONMSG(client, "[%02d] %-20.19s  %-10.9s  %-20.19s  %6s\n", pl->m_Id, name, version, author, status);
   1.273 -					}
   1.274 +				if (!plnum)
   1.275 +				{
   1.276 +					CLIENT_CONMSG(client, "No active plugins loaded.\n");
   1.277  				}
   1.278  
   1.279  				RETURN_META(MRES_SUPERCEDE);