Merge pull request #728 from alliedmodders/show-required-exts

Split optional extensions into their own block if not found.
alliedmodders · Nov 30, 2017 · 6896ef7 · 6896ef7
2 parents 89732f7 + c87afde
commit 6896ef7
Show file tree

Hide file tree

Showing 2 changed files with 57 additions and 10 deletions.
diff --git a/core/logic/ExtensionSys.cpp b/core/logic/ExtensionSys.cpp
@@ -43,8 +43,9 @@
 CExtensionManager g_Extensions;
 IdentityType_t g_ExtType;
 
-void CExtension::Initialize(const char *filename, const char *path)
+void CExtension::Initialize(const char *filename, const char *path, bool bRequired)
 {
+	m_bRequired = bRequired;
 	m_pAPI = NULL;
 	m_pIdentToken = NULL;
 	unload_code = 0;
@@ -62,7 +63,7 @@ CRemoteExtension::CRemoteExtension(IExtensionInterface *pAPI, const char *filena
 	m_pAPI = pAPI;
 }
 
-CLocalExtension::CLocalExtension(const char *filename)
+CLocalExtension::CLocalExtension(const char *filename, bool bRequired)
 {
 	m_PlId = 0;
 	m_pLib = NULL;
@@ -139,7 +140,7 @@ CLocalExtension::CLocalExtension(const char *filename)
 	}
 
 found:
-	Initialize(filename, path);
+	Initialize(filename, path, bRequired);
 }
 
 bool CRemoteExtension::Load(char *error, size_t maxlength)
@@ -505,6 +506,11 @@ void CExtension::AddLibrary(const char *library)
 	m_Libraries.push_back(library);
 }
 
+bool CExtension::IsRequired()
+{
+	return m_bRequired;
+}
+
 /*********************
  * EXTENSION MANAGER *
  *********************/
@@ -597,7 +603,7 @@ IExtension *CExtensionManager::LoadAutoExtension(const char *path, bool bErrorOn
 	}
 
 	char error[256];
-	CExtension *p = new CLocalExtension(path);
+	CExtension *p = new CLocalExtension(path, bErrorOnMissing);
 
 	/* We put us in the list beforehand so extensions that check for each other
 	 * won't recursively load each other.
@@ -941,7 +947,21 @@ void CExtensionManager::OnRootConsoleCommand(const char *cmdname, const ICommand
 			List<CExtension *>::iterator iter;
 			CExtension *pExt;
 			unsigned int num = 1;
-			switch (m_Libs.size())
+
+			List<CExtension *> required; // List of loaded and required extensions
+			List<CExtension *> optional; // List of non loaded optional extensions
+
+			for (iter = m_Libs.begin(); iter != m_Libs.end(); iter++)
+			{
+				pExt = (*iter);
+
+				if (pExt->IsLoaded() || pExt->IsRequired())
+					required.push_back(pExt);
+				else if (!pExt->IsLoaded() && !pExt->IsRequired())
+					optional.push_back(pExt);
+			}
+
+			switch (required.size())
 			{
 			case 1:
 				{
@@ -955,11 +975,11 @@ void CExtensionManager::OnRootConsoleCommand(const char *cmdname, const ICommand
 				}
 			default:
 				{
-					rootmenu->ConsolePrint("[SM] Displaying %d extensions:", m_Libs.size());
+					rootmenu->ConsolePrint("[SM] Displaying %d extensions:", required.size());
 					break;
 				}
 			}
-			for (iter=m_Libs.begin(); iter!=m_Libs.end(); iter++,num++)
+			for (iter = required.begin(); iter != required.end(); iter++,num++)
 			{
 				pExt = (*iter);
 				if (pExt->IsLoaded())
@@ -977,10 +997,35 @@ void CExtensionManager::OnRootConsoleCommand(const char *cmdname, const ICommand
 						const char *descr = pAPI->GetExtensionDescription();
 						rootmenu->ConsolePrint("[%02d] %s (%s): %s", num, name, version, descr);
 					}
-				} else {
+				}
+				else
+				{
 					rootmenu->ConsolePrint("[%02d] <FAILED> file \"%s\": %s", num, pExt->GetFilename(), pExt->m_Error.c_str());
 				}
 			}
+			if (optional.size())
+			{
+				num = 1;
+				switch (optional.size())
+				{
+					case 1:
+					{
+						rootmenu->ConsolePrint("\n[SM] Displaying 1 optional extension not found:");
+						break;
+					}
+					default:
+					{
+						rootmenu->ConsolePrint("\n[SM] Displaying %d optional extensions not found:", optional.size());
+						break;
+					}
+				}
+
+				for (iter = optional.begin(); iter != optional.end(); iter++,num++)
+				{
+					pExt = (*iter);
+					rootmenu->ConsolePrint("[%02d] \"%s\"", num, pExt->GetFilename());
+				}
+			}
 			return;
 		}
 		else if (strcmp(cmd, "load") == 0)

diff --git a/core/logic/ExtensionSys.h b/core/logic/ExtensionSys.h
@@ -80,14 +80,15 @@ class CExtension :
 	void AddPlugin(CPlugin *pPlugin);
 	void MarkAllLoaded();
 	void AddLibrary(const char *library);
+	bool IsRequired();
 public:
 	virtual bool Load(char *error, size_t maxlength);
 	virtual bool IsLoaded() =0;
 	virtual void Unload() =0;
 	virtual bool Reload(char *error, size_t maxlength) =0;
 	virtual bool IsSameFile(const char* file) =0;
 protected:
-	void Initialize(const char *filename, const char *path);
+	void Initialize(const char *filename, const char *path, bool bRequired = true);
 	bool PerformAPICheck(char *error, size_t maxlength);
 	void CreateIdentity();
 	void DestroyIdentity();
@@ -104,12 +105,13 @@ class CExtension :
 	List<String> m_Libraries;
 	unsigned int unload_code;
 	bool m_bFullyLoaded;
+	bool m_bRequired;
 };
 
 class CLocalExtension : public CExtension
 {
 public:
-	CLocalExtension(const char *filename);
+	CLocalExtension(const char *filename, bool bRequired = true);
 public:
 	bool Load(char *error, size_t maxlength);
 	bool IsLoaded();