iarv/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-03-28 17:42:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make modpython support different module types

Browse Source
This commit is contained in:
Kyle Fuller
2011-08-13 17:01:55 +01:00
parent 9e33e4bf59
commit 274d3eb2ec
6 changed files with 147 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
modules/modpython/znc.py
View File

@@ -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