Make modpython support different module types

modules/modperl.cpp

@@ -148,7 +148,7 @@ public:
 				case Perl_Loaded:
 					result = HALT;
 					if (4 == ret) {
-						ModInfo.SetType(ModuleTypeUser);
+						ModInfo.AddType(ModuleTypeUser);
 						ModInfo.SetDescription(PString(ST(2)));
 						ModInfo.SetName(sModule);
 						ModInfo.SetPath(PString(ST(1)));
@@ -203,7 +203,7 @@ public:
 				PUSH_STR(sName);
 				PCALL("ZNC::Core::ModInfoByPath");
 				if (!SvTRUE(ERRSV) && ret == 2) {
-					ModInfo.SetType(ModuleTypeUser);
+					ModInfo.AddType(ModuleTypeUser);
 					ModInfo.SetDescription(PString(ST(0)));
 					ModInfo.SetName(sName);
 					ModInfo.SetPath(sPath);

modules/modpython.cpp

@@ -135,10 +135,11 @@ public:
 			bSuccess = false;
 			return HALT;
 		}
-		PyObject* pyRes = PyObject_CallFunction(pyFunc, const_cast<char*>("ssNNN"),
+		PyObject* pyRes = PyObject_CallFunction(pyFunc, const_cast<char*>("ssiNNN"),
 				sModName.c_str(),
 				sArgs.c_str(),
-				(eType == ModuleTypeUser ? SWIG_NewInstanceObj(GetUser(), SWIG_TypeQuery("CUser*"), 0) : NULL),
+				(int)eType,
+				(eType == ModuleTypeUser ? SWIG_NewInstanceObj(GetUser(), SWIG_TypeQuery("CUser*"), 0) : Py_None),
 				CPyRetString::wrap(sRetMsg),
 				SWIG_NewInstanceObj(reinterpret_cast<CModule*>(this), SWIG_TypeQuery("CModule*"), 0));
 		if (!pyRes) {
@@ -279,7 +280,7 @@ public:
 			return;
 		}
 		Py_CLEAR(pyRes);
-		if (x && ModInfo.GetType() == eType) {
+		if (x && ModInfo.SupportsType(eType)) {
 			ssMods.insert(ModInfo);
 			ssAlready.insert(sName);
 		}

modules/modpython/znc.py

@@ -150,7 +150,7 @@ class ModuleNV(collections.MutableMapping):
 
 class Module:
     description = '< Placeholder for a description >'
-    module_type = ModuleTypeUser
+    module_types = [ModuleTypeUser]
 
     wiki_page = ''
 
@@ -423,7 +423,7 @@ def find_open(modname):
         return (None, None)
 
 
-def load_module(modname, args, user, retmsg, modpython):
+def load_module(modname, args, module_type, user, retmsg, modpython):
     '''Returns 0 if not found, 1 on loading error, 2 on success'''
     if re.search(r'[^a-zA-Z0-9_]', modname) is not None:
         retmsg.s = 'Module names can only contain letters, numbers and ' \
@@ -437,21 +437,38 @@ def load_module(modname, args, user, retmsg, modpython):
             pymodule.__file__, modname)
         return 1
     cl = pymodule.__dict__[modname]
+
+    if module_type not in cl.module_types:
+        retmsg.s = "Module [{}] doesn't support type.".format(modname)
+        return 1
+
     module = cl()
-    if user:
+    if module_type == ModuleTypeUser:
         module._cmod = CreateUserPyModule(user, modname, datapath, module, modpython)
-    else:
+    elif module_type == ModuleTypeGlobal:
         module._cmod = CreateGlobalPyModule(modname, datapath, module, modpython)
+    else:
+        retmsg.s = "Module [modpython] doesn't support module type."
+        return 1
+
     module.nv = ModuleNV(module._cmod)
     module.SetDescription(cl.description)
     module.SetArgs(args)
     module.SetModPath(pymodule.__file__)
-    module.SetType(cl.module_type)
+    module.SetType(module_type)
 
-    if user:
+    if module_type == ModuleTypeUser:
+        if not user:
+            retmsg.s = "Module [modpython] needs user for for ModuleTypeUser."
+            unload_module(module)
+            return 1
         user.GetModules().push_back(module._cmod)
-    else:
+    elif module_type == ModuleTypeGlobal:
         CZNC.Get().GetModules().push_back(module._cmod)
+    else:
+        retmsg.s = "Module [modpython] doesn't support module type."
+        unload_module(module)
+        return 1
 
     try:
         loaded = True
@@ -511,7 +528,8 @@ def get_mod_info(modname, retmsg, modinfo):
             pymodule.__file__, modname)
         return 1
     cl = pymodule.__dict__[modname]
-    modinfo.SetType(cl.module_type)
+    for module_type in cl.module_types:
+        modinfo.AddType(module_type)
     modinfo.SetDescription(cl.description)
     modinfo.SetWikiPage(cl.wiki_page)
     modinfo.SetName(modname)
@@ -539,11 +557,13 @@ def get_mod_info_path(path, modname, modinfo):
     if modname not in pymodule.__dict__:
         return 0
     cl = pymodule.__dict__[modname]
-    modinfo.SetType(cl.module_type)
     modinfo.SetDescription(cl.description)
     modinfo.SetWikiPage(cl.wiki_page)
     modinfo.SetName(modname)
     modinfo.SetPath(pymodule.__file__)
+    for module_type in cl.module_types:
+        modinfo.AddType(module_type)
+
     return 1