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

Create EModuleType, creating SetType which replaces SetGlobal

Browse Source
This commit is contained in:
Kyle Fuller
2011-08-08 16:09:22 +01:00
parent 091a2875ad
commit a4b155995c
10 changed files with 85 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
modules/modpython.cpp
View File

@@ -128,9 +128,6 @@ public:
virtual EModRet OnModuleLoading(const CString& sModName, const CString& sArgs,
bool& bSuccess, CString& sRetMsg) {
if (!GetUser()) {
return CONTINUE;
}
PyObject* pyFunc = PyObject_GetAttrString(m_PyZNCModule, "load_module");
if (!pyFunc) {
sRetMsg = GetPyExceptionStr();
@@ -252,7 +249,7 @@ public:
return HALT;
}
void TryAddModInfo(const CString& sPath, const CString& sName, set<CModInfo>& ssMods, set<CString>& ssAlready) {
void TryAddModInfo(const CString& sPath, const CString& sName, set<CModInfo>& ssMods, set<CString>& ssAlready, EModuleType eType) {
if (ssAlready.count(sName)) {
return;
}
@@ -282,17 +279,13 @@ public:
return;
}
Py_CLEAR(pyRes);
if (x) {
if (x && ModInfo.GetType() == eType) {
ssMods.insert(ModInfo);
ssAlready.insert(sName);
}
}
virtual void OnGetAvailableMods(set<CModInfo>& ssMods, bool bGlobal) {
if (bGlobal) {
return;
}
virtual void OnGetAvailableMods(set<CModInfo>& ssMods, EModuleType eType) {
CDir Dir;
CModules::ModDirList dirs = CModules::GetModDirs();
@@ -306,7 +299,7 @@ public:
CString sPath = File.GetLongName();
sPath.TrimSuffix(sName);
sName.RightChomp(3);
TryAddModInfo(sPath, sName, ssMods, already);
TryAddModInfo(sPath, sName, ssMods, already, eType);
}
Dir.FillByWildcard(dirs.front().first, "*.pyc");
@@ -316,7 +309,7 @@ public:
CString sPath = File.GetLongName();
sPath.TrimSuffix(sName);
sName.RightChomp(4);
TryAddModInfo(sPath, sName, ssMods, already);
TryAddModInfo(sPath, sName, ssMods, already, eType);
}
Dir.FillByWildcard(dirs.front().first, "*.so");
@@ -326,7 +319,7 @@ public:
CString sPath = File.GetLongName();
sPath.TrimSuffix(sName);
sName.RightChomp(3);
TryAddModInfo(sPath, sName, ssMods, already);
TryAddModInfo(sPath, sName, ssMods, already, eType);
}
dirs.pop();