ListenerManager.(un)register_listener can now raise a ValueError

Added ListenerManager.clear()

Author: Ayuto

src/core/modules/listeners/listeners_manager.cpp

@@ -41,9 +41,11 @@ void CListenerManager::RegisterListener(PyObject* pCallable)
 	// Is the callable already in the vector?
 	if( !m_vecCallables.HasElement(oCallable) )
 	{
-		// Add the callable to the vector
 		m_vecCallables.AddToTail(oCallable);
 	}
+	else {
+		BOOST_RAISE_EXCEPTION(PyExc_ValueError, "Callback already registered.")
+	}
 }
 
 
@@ -55,8 +57,14 @@ void CListenerManager::UnregisterListener(PyObject* pCallable)
 	// Get the object instance of the callable
 	object oCallable = object(handle<>(borrowed(pCallable)));
 
-	// Remove the callback from the ServerCommandManager instance
-	m_vecCallables.FindAndRemove(oCallable);
+	int index = m_vecCallables.Find(oCallable);
+
+	if (index == -1) {
+		BOOST_RAISE_EXCEPTION(PyExc_ValueError, "Callback not registered.")
+	}
+	else {
+		m_vecCallables.Remove(index);
+	}
 }
 
 
@@ -98,3 +106,8 @@ object CListenerManager::__getitem__(unsigned int index)
 
 	return m_vecCallables[index];
 }
+
+void CListenerManager::clear()
+{
+	m_vecCallables.RemoveAll();
+}

src/core/modules/listeners/listeners_manager.h

@@ -68,6 +68,7 @@ class CListenerManager
 	int GetCount();
 	bool IsRegistered(object oCallback);
 	object __getitem__(unsigned int index);
+	void clear();
 
 public:
 	CUtlVector<object> m_vecCallables;

src/core/modules/listeners/listeners_wrap.cpp

@@ -111,6 +111,11 @@ void export_listener_managers(scope _listeners)
 			&CListenerManager::__getitem__,
 			"Return the callback at the given index."
 		)
+
+		.def("clear",
+			&CListenerManager::clear,
+			"Remove all registered callbacks."
+		)
 	;
 
 	_listeners.attr("on_client_active_listener_manager") = object(ptr(GetOnClientActiveListenerManager()));