1.1 --- a/sourcemm/CPlugin.cpp Mon Jul 23 18:19:02 2007 +0000
1.2 +++ b/sourcemm/CPlugin.cpp Fri Aug 10 23:43:16 2007 +0000
1.3 @@ -302,6 +302,37 @@
1.4 return NULL;
1.5 }
1.6
1.7 +int CPluginManager::GetPluginCount()
1.8 +{
1.9 + return (int)m_Plugins.size();
1.10 +}
1.11 +
1.12 +const char *CPluginManager::GetStatusText(CPlugin *pl)
1.13 +{
1.14 + switch (pl->m_Status)
1.15 + {
1.16 + case Pl_NotFound:
1.17 + return "NOFILE";
1.18 + case Pl_Error:
1.19 + return "ERROR";
1.20 + case Pl_Refused:
1.21 + return "FAILED";
1.22 + case Pl_Paused:
1.23 + return "PAUSED";
1.24 + case Pl_Running:
1.25 + {
1.26 + if (pl->m_API && pl->m_API->QueryRunning(NULL, 0))
1.27 + {
1.28 + return "STOPPED";
1.29 + } else {
1.30 + return "RUNNING";
1.31 + }
1.32 + }
1.33 + default:
1.34 + return "-";
1.35 + }
1.36 +}
1.37 +
1.38 CPluginManager::CPlugin *CPluginManager::_Load(const char *file, PluginId source, char *error, size_t maxlen)
1.39 {
1.40 FILE *fp;
2.1 --- a/sourcemm/CPlugin.h Mon Jul 23 18:19:02 2007 +0000
2.2 +++ b/sourcemm/CPlugin.h Fri Aug 10 23:43:16 2007 +0000
2.3 @@ -116,6 +116,9 @@
2.4 */
2.5 bool Retry(PluginId id, char *error, size_t len);
2.6
2.7 + int GetPluginCount();
2.8 + const char *GetStatusText(CPlugin *pl);
2.9 +
2.10 //get alias info
2.11 const char *LookupAlias(const char *alias);
2.12 SourceHook::List<SourceMM::CNameAlias *>::iterator _alias_begin();
3.1 --- a/sourcemm/changelog.txt Mon Jul 23 18:19:02 2007 +0000
3.2 +++ b/sourcemm/changelog.txt Fri Aug 10 23:43:16 2007 +0000
3.3 @@ -10,6 +10,8 @@
3.4 version.
3.5 - Added OnUnlinkConCommandBase to IMetamodListner to notify when Metamod:Source
3.6 is about to remove a concommand or convar.
3.7 + - The output of the "meta list" command has been reformatted in order to allow
3.8 + more space for plugins' name, version, and author fields.
3.9
3.10 2007/06/26 1.4.2:
3.11 - Fixed a bug where unloading all plugins could crash if one plugin had child
4.1 --- a/sourcemm/concommands.cpp Mon Jul 23 18:19:02 2007 +0000
4.2 +++ b/sourcemm/concommands.cpp Fri Aug 10 23:43:16 2007 +0000
4.3 @@ -15,6 +15,9 @@
4.4 #include "sh_string.h"
4.5 #include "sh_list.h"
4.6
4.7 +using namespace SourceMM;
4.8 +using namespace SourceHook;
4.9 +
4.10 /**
4.11 * @brief Console Command Implementations
4.12 * @file concommands.cpp
4.13 @@ -50,7 +53,7 @@
4.14
4.15 void SMConVarAccessor::MarkCommandsAsGameDLL()
4.16 {
4.17 - for (SourceHook::List<ConCommandBase*>::iterator iter = m_RegisteredCommands.begin();
4.18 + for (List<ConCommandBase*>::iterator iter = m_RegisteredCommands.begin();
4.19 iter != m_RegisteredCommands.end(); ++iter)
4.20 {
4.21 (*iter)->AddFlags(FCVAR_GAMEDLL);
4.22 @@ -61,8 +64,8 @@
4.23 {
4.24 /* Notify via IMetamodListener */
4.25 PluginIter iter;
4.26 - SourceMM::CPluginManager::CPlugin *pPlugin;
4.27 - SourceHook::List<IMetamodListener *>::iterator event;
4.28 + CPluginManager::CPlugin *pPlugin;
4.29 + List<IMetamodListener *>::iterator event;
4.30 IMetamodListener *pML;
4.31 for (iter=g_PluginMngr._begin(); iter!=g_PluginMngr._end(); iter++)
4.32 {
4.33 @@ -217,65 +220,63 @@
4.34
4.35 return;
4.36 } else if (strcmp(command, "list") == 0) {
4.37 - SourceMM::CPluginManager::CPlugin *pl;
4.38 + CPluginManager::CPlugin *pl;
4.39 + ISmmPlugin *plapi;
4.40 + const char *plname;
4.41 PluginIter i;
4.42 - const char *status="";
4.43 - const char *version=NULL;
4.44 - const char *name=NULL;
4.45 - const char *author=NULL;
4.46 + char buffer[256];
4.47 + int len;
4.48 + int plnum = g_PluginMngr.GetPluginCount();
4.49
4.50 - CONMSG("-Id- %-20.19s %-10.9s %-20.19s %-8.7s\n", "Name", "Version", "Author", "Status");
4.51 - for (i=g_PluginMngr._begin(); i!=g_PluginMngr._end(); i++)
4.52 + if (!plnum)
4.53 + {
4.54 + CONMSG("No plugins loaded.\n");
4.55 + return;
4.56 + } else {
4.57 + CONMSG("Listing %d plugin%s:\n", plnum, (plnum > 1) ? "s" : "");
4.58 + }
4.59 +
4.60 + for (i = g_PluginMngr._begin(); i != g_PluginMngr._end(); i++)
4.61 {
4.62 pl = (*i);
4.63 if (!pl)
4.64 - break;
4.65 - if (pl->m_Status == Pl_Paused)
4.66 {
4.67 - status = "PAUSE";
4.68 - } else if (pl->m_Status == Pl_Running) {
4.69 - if (pl->m_API && pl->m_API->QueryRunning(NULL, 0))
4.70 - status = "RUN";
4.71 - else
4.72 - status = "STOPPED";
4.73 - } else if (pl->m_Status == Pl_Refused) {
4.74 - status = "FAIL";
4.75 - } else if (pl->m_Status == Pl_Error) {
4.76 - status = "ERROR";
4.77 - } else if (pl->m_Status == Pl_NotFound) {
4.78 - status = "NOFILE";
4.79 + break;
4.80 + }
4.81 +
4.82 + len = 0;
4.83 +
4.84 + if (pl->m_Status != Pl_Running)
4.85 + {
4.86 + len += UTIL_Format(buffer, sizeof(buffer), " [%02d] <%s>", pl->m_Id, g_PluginMngr.GetStatusText(pl));
4.87 + } else {
4.88 + len += UTIL_Format(buffer, sizeof(buffer), " [%02d]", pl->m_Id);
4.89 }
4.90
4.91 - if (pl->m_API)
4.92 + if ((plapi = pl->m_API))
4.93 {
4.94 - version = pl->m_API->GetVersion();
4.95 - author = pl->m_API->GetAuthor();
4.96 - name = pl->m_API->GetName();
4.97 - } else {
4.98 - version = "-";
4.99 - author = "-";
4.100 - name = "-";
4.101 + plname = IS_STR_FILLED(plapi->GetName()) ? plapi->GetName() : pl->m_File.c_str();
4.102 + len += UTIL_Format(&buffer[len], sizeof(buffer)-len, " %s", plname);
4.103 +
4.104 + if (IS_STR_FILLED(plapi->GetVersion()))
4.105 + {
4.106 + len += UTIL_Format(&buffer[len], sizeof(buffer)-len, " (%s)", plapi->GetVersion());
4.107 + }
4.108 + if (IS_STR_FILLED(plapi->GetAuthor()))
4.109 + {
4.110 + UTIL_Format(&buffer[len], sizeof(buffer)-len, " by %s", plapi->GetAuthor());
4.111 + }
4.112 }
4.113
4.114 - if (!version)
4.115 - version = "-";
4.116 - if (!author)
4.117 - author = "-";
4.118 - if (!name)
4.119 - name = pl->m_File.c_str();
4.120 -
4.121 -
4.122 - CONMSG("[%02d] %-20.19s %-10.9s %-20.19s %-8.7s\n", pl->m_Id, name, version, author, status);
4.123 + CONMSG("%s\n", buffer);
4.124 }
4.125
4.126 - //CONMSG("\n");
4.127 -
4.128 return;
4.129 } else if (strcmp(command, "cmds") == 0) {
4.130 if (args >= 3)
4.131 {
4.132 int id = atoi(e->Cmd_Argv(2));
4.133 - SourceMM::CPluginManager::CPlugin *pl = g_PluginMngr.FindById(id);
4.134 + CPluginManager::CPlugin *pl = g_PluginMngr.FindById(id);
4.135
4.136 if (!pl)
4.137 {
4.138 @@ -288,7 +289,7 @@
4.139 CONMSG("Plugin %d is not loaded.\n", id);
4.140 } else {
4.141 CONMSG("Console commands for %s:\n", pl->m_API->GetName());
4.142 - SourceHook::List<ConCommandBase *>::iterator ci;
4.143 + List<ConCommandBase *>::iterator ci;
4.144 size_t count = 0;
4.145
4.146 for (ci=pl->m_Cmds.begin(); ci!=pl->m_Cmds.end(); ci++)
4.147 @@ -306,7 +307,7 @@
4.148 if (args >= 3)
4.149 {
4.150 int id = atoi(e->Cmd_Argv(2));
4.151 - SourceMM::CPluginManager::CPlugin *pl = g_PluginMngr.FindById(id);
4.152 + CPluginManager::CPlugin *pl = g_PluginMngr.FindById(id);
4.153
4.154 if (!pl)
4.155 {
4.156 @@ -319,7 +320,7 @@
4.157 CONMSG("Plugin %d is not loaded.\n", id);
4.158 } else {
4.159 CONMSG("Registered cvars for %s:\n", pl->m_API->GetName());
4.160 - SourceHook::List<ConCommandBase *>::iterator ci;
4.161 + List<ConCommandBase *>::iterator ci;
4.162 size_t count = 0;
4.163
4.164 for (ci=pl->m_Cvars.begin(); ci!=pl->m_Cvars.end(); ci++)
4.165 @@ -337,7 +338,7 @@
4.166 if (args >= 3)
4.167 {
4.168 int id = atoi(e->Cmd_Argv(2));
4.169 - SourceMM::CPluginManager::CPlugin *pl = g_PluginMngr.FindById(id);
4.170 + CPluginManager::CPlugin *pl = g_PluginMngr.FindById(id);
4.171 if (!pl)
4.172 {
4.173 CONMSG("Plugin %d not found.\n", id);
4.174 @@ -446,7 +447,7 @@
4.175
4.176 char error[255]={0};
4.177 bool already;
4.178 - SourceMM::CPluginManager::CPlugin *pl;
4.179 + CPluginManager::CPlugin *pl;
4.180
4.181 PluginId id = g_PluginMngr.Load(full_path, Pl_Console, already, error, sizeof(error));
4.182 pl = g_PluginMngr.FindById(id);
4.183 @@ -493,8 +494,8 @@
4.184 CONMSG("Alias \"%s\" was not found.\n", alias);
4.185 }
4.186 } else {
4.187 - SourceHook::List<SourceMM::CNameAlias *>::iterator iter, end;
4.188 - SourceMM::CNameAlias *p;
4.189 + List<CNameAlias *>::iterator iter, end;
4.190 + CNameAlias *p;
4.191
4.192 iter = g_PluginMngr._alias_begin();
4.193 end = g_PluginMngr._alias_end();
4.194 @@ -547,8 +548,8 @@
4.195 g_SmmAPI.PathFormat(full_path, sizeof(full_path), "%s/%s%s", g_ModPath.c_str(), file, ext);
4.196 }
4.197
4.198 - SourceHook::List<SourceMM::CPluginManager::CPlugin *>::iterator iter, end;
4.199 - SourceMM::CPluginManager::CPlugin *pl;
4.200 + List<CPluginManager::CPlugin *>::iterator iter, end;
4.201 + CPluginManager::CPlugin *pl;
4.202 iter = g_PluginMngr._begin();
4.203 end = g_PluginMngr._end();
4.204 for (; iter!=end; iter++)
4.205 @@ -729,43 +730,47 @@
4.206
4.207 RETURN_META(MRES_SUPERCEDE);
4.208 } else if(strcmp(subcmd, "list") == 0) {
4.209 - SourceMM::CPluginManager::CPlugin *pl;
4.210 - Pl_Status st;
4.211 + CPluginManager::CPlugin *pl;
4.212 + ISmmPlugin *plapi;
4.213 + const char *plname;
4.214 PluginIter i;
4.215 - const char *version = NULL;
4.216 - const char *name = NULL;
4.217 - const char *author = NULL;
4.218 - const char *status = NULL;
4.219 + char buffer[256];
4.220 + int len = 0;
4.221 + int plnum = 0;
4.222
4.223 - CLIENT_CONMSG(client, "-Id- %-20.19s %-10.9s %-20.19s %6s\n", "Name", "Version", "Author", "Status");
4.224 -
4.225 - for (i=g_PluginMngr._begin(); i!=g_PluginMngr._end(); i++)
4.226 + for (i = g_PluginMngr._begin(); i != g_PluginMngr._end(); i++, len=0)
4.227 {
4.228 pl = (*i);
4.229 - if (!pl)
4.230 - break;
4.231 -
4.232 - st = pl->m_Status;
4.233 -
4.234 - /* Only show plugins that are running or paused */
4.235 - if (pl->m_API && (st == Pl_Running || st == Pl_Paused))
4.236 + if (pl && pl->m_Status == Pl_Running)
4.237 {
4.238 - version = pl->m_API->GetVersion();
4.239 - author = pl->m_API->GetAuthor();
4.240 - name = pl->m_API->GetName();
4.241 + plapi = pl->m_API;
4.242 + if (!plapi || !plapi->QueryRunning(NULL, 0))
4.243 + {
4.244 + continue;
4.245 + }
4.246 + plnum++;
4.247 +
4.248 + len += UTIL_Format(buffer, sizeof(buffer), " [%02d]", plnum);
4.249
4.250 - if (st == Pl_Running && pl->m_API->QueryRunning(NULL, 0))
4.251 + plname = IS_STR_FILLED(plapi->GetName()) ? plapi->GetName() : pl->m_File.c_str();
4.252 + len += UTIL_Format(&buffer[len], sizeof(buffer)-len, " %s", plname);
4.253 +
4.254 + if (IS_STR_FILLED(plapi->GetVersion()))
4.255 {
4.256 - status = "RUN";
4.257 - } else {
4.258 - status = "PAUSE";
4.259 + len += UTIL_Format(&buffer[len], sizeof(buffer)-len, " (%s)", plapi->GetVersion());
4.260 + }
4.261 + if (IS_STR_FILLED(plapi->GetAuthor()))
4.262 + {
4.263 + UTIL_Format(&buffer[len], sizeof(buffer)-len, " by %s", plapi->GetAuthor());
4.264 }
4.265
4.266 - if (!version || !author || !name)
4.267 - break;
4.268 + CLIENT_CONMSG(client, "%s\n", buffer);
4.269 + }
4.270 + }
4.271
4.272 - CLIENT_CONMSG(client, "[%02d] %-20.19s %-10.9s %-20.19s %6s\n", pl->m_Id, name, version, author, status);
4.273 - }
4.274 + if (!plnum)
4.275 + {
4.276 + CLIENT_CONMSG(client, "No active plugins loaded.\n");
4.277 }
4.278
4.279 RETURN_META(MRES_SUPERCEDE);
5.1 --- a/sourcemm/util.h Mon Jul 23 18:19:02 2007 +0000
5.2 +++ b/sourcemm/util.h Fri Aug 10 23:43:16 2007 +0000
5.3 @@ -19,6 +19,11 @@
5.4 */
5.5
5.6 /**
5.7 + * @brief Returns true is string is not blank, false otherwise.
5.8 + */
5.9 +#define IS_STR_FILLED(var) (var != NULL && var[0] != '\0')
5.10 +
5.11 +/**
5.12 * @brief Returns a pointer to the extension in a file name.
5.13 */
5.14 const char *UTIL_GetExtension(const char *file);