modpython: Show (module/__init__.py) in listavailmods

This commit is contained in:
Kyle Fuller
2011-09-05 17:27:35 +00:00
parent 9e95d1c3e1
commit 12d1a5a422
2 changed files with 12 additions and 21 deletions

View File

@@ -294,33 +294,23 @@ public:
while (!dirs.empty()) {
set<CString> already;
Dir.FillByWildcard(dirs.front().first, "*.py");
Dir.Fill(dirs.front().first);
for (unsigned int a = 0; a < Dir.size(); a++) {
CFile& File = *Dir[a];
CString sName = File.GetShortName();
CString sPath = File.GetLongName();
sPath.TrimSuffix(sName);
sName.RightChomp(3);
TryAddModInfo(sPath, sName, ssMods, already, eType);
}
Dir.FillByWildcard(dirs.front().first, "*.pyc");
for (unsigned int a = 0; a < Dir.size(); a++) {
CFile& File = *Dir[a];
CString sName = File.GetShortName();
CString sPath = File.GetLongName();
sPath.TrimSuffix(sName);
sName.RightChomp(4);
TryAddModInfo(sPath, sName, ssMods, already, eType);
}
if (!File.IsDir()) {
if (sName.WildCmp("*.pyc")) {
sName.RightChomp(4);
} else if (sName.WildCmp("*.py") || sName.WildCmp("*.so")) {
sName.RightChomp(3);
} else {
continue;
}
}
Dir.FillByWildcard(dirs.front().first, "*.so");
for (unsigned int a = 0; a < Dir.size(); a++) {
CFile& File = *Dir[a];
CString sName = File.GetShortName();
CString sPath = File.GetLongName();
sPath.TrimSuffix(sName);
sName.RightChomp(3);
TryAddModInfo(sPath, sName, ssMods, already, eType);
}