OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Allow arbitrary wildcards in config includes. Things like 

Include-Modules = "addin-modules/*/config/*.ini" will now work.
Adds Util.Glob, which will resolve a globbed path into a string list.
arthursv
Melanie 2009-08-06 02:29:12 +01:00
parent c73ee1d06e
commit efc57bc3d7
2 changed files with 55 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
OpenSim/Framework/Util.cs
View File

@ -1111,5 +1111,56 @@ namespace OpenSim.Framework
return null;
}
public static string[] Glob(string path)
{
string vol=String.Empty;
if (Path.VolumeSeparatorChar != Path.DirectorySeparatorChar)
{
string[] vcomps = path.Split(new char[] {Path.VolumeSeparatorChar}, 2, StringSplitOptions.RemoveEmptyEntries);
if (vcomps.Length > 1)
{
path = vcomps[1];
vol = vcomps[0];
}
}
string[] comps = path.Split(new char[] {Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar}, StringSplitOptions.RemoveEmptyEntries);
// Glob
path = vol;
if (vol != String.Empty)
path += new String(new char[] {Path.VolumeSeparatorChar, Path.DirectorySeparatorChar});
else
path = new String(new char[] {Path.DirectorySeparatorChar});
List<string> paths = new List<string>();
List<string> found = new List<string>();
paths.Add(path);
foreach (string c in comps)
{
List<string> addpaths = new List<string>();
foreach (string p in paths)
{
string[] dirs = Directory.GetDirectories(p, c);
if (dirs.Length != 0)
{
foreach (string dir in dirs)
addpaths.Add(Path.Combine(path, dir));
}
string[] files = Directory.GetFiles(p, c);
foreach (string f in files)
found.Add(f);
}
paths = addpaths;
}
return found.ToArray();
}
}
}

7
OpenSim/Region/Application/ConfigurationLoader.cs
View File

@ -188,10 +188,11 @@ namespace OpenSim
{
string path = Path.GetFullPath(
Path.Combine(Util.configDir(), file));
if (File.Exists(path))
string[] paths = Util.Glob(path);
foreach (string p in paths)
{
if (!sources.Contains(path))
sources.Add(path);
if (!sources.Contains(p))
sources.Add(p);
}
}
}