stjr/UltimateZoneBuilder
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/UltimateZoneBuilder.git synced 2025-01-18 22:41:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed problem when #include'ing files from a directory structure and using different directory path separators than the current OS's ones. Fixes #470.

Browse source
This commit is contained in:
biwa 2020-09-19 20:34:32 +02:00
parent 2998fc514a
commit cd8d73d4cb
1 changed files with 24 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
Source/Core/IO/DirectoryFilesList.cs
View file

@ -25,6 +25,27 @@ using CodeImp.DoomBuilder.Data;
namespace CodeImp.DoomBuilder.IO namespace CodeImp.DoomBuilder.IO
{ {
/// <summary>
/// Compares two paths, ignoring case and converting the secondary string to the system's directory separator
/// </summary>
internal sealed class PathEqualityComparer : IEqualityComparer<string>
{
public bool Equals(string s1, string s2)
{
return s1.ToLowerInvariant() == ConvertPath(s2);
}
public int GetHashCode(string s)
{
return ConvertPath(s).GetHashCode();
}
private string ConvertPath(string s)
{
return s.Replace('\\', Path.DirectorySeparatorChar).Replace('/', Path.DirectorySeparatorChar).ToLowerInvariant();
}
}
internal sealed class DirectoryFilesList internal sealed class DirectoryFilesList
{ {
#region ================== Constants (mxd) #region ================== Constants (mxd)
@ -52,7 +73,7 @@ namespace CodeImp.DoomBuilder.IO
path = Path.GetFullPath(path); path = Path.GetFullPath(path);
string[] files = Directory.GetFiles(path, "*", subdirectories ? SearchOption.AllDirectories : SearchOption.TopDirectoryOnly); string[] files = Directory.GetFiles(path, "*", subdirectories ? SearchOption.AllDirectories : SearchOption.TopDirectoryOnly);
Array.Sort(files); //mxd Array.Sort(files); //mxd
entries = new Dictionary<string, DirectoryFileEntry>(files.Length, StringComparer.OrdinalIgnoreCase); entries = new Dictionary<string, DirectoryFileEntry>(files.Length, new PathEqualityComparer());
wadentries = new List<string>(); wadentries = new List<string>();
foreach(string file in files) //mxd foreach(string file in files) //mxd
@ -84,7 +105,7 @@ namespace CodeImp.DoomBuilder.IO
// Constructor for custom list // Constructor for custom list
public DirectoryFilesList(string resourcename, ICollection<DirectoryFileEntry> sourceentries) public DirectoryFilesList(string resourcename, ICollection<DirectoryFileEntry> sourceentries)
{ {
entries = new Dictionary<string, DirectoryFileEntry>(sourceentries.Count, StringComparer.OrdinalIgnoreCase); entries = new Dictionary<string, DirectoryFileEntry>(sourceentries.Count, new PathEqualityComparer());
wadentries = new List<string>(); wadentries = new List<string>();
foreach(DirectoryFileEntry e in sourceentries) foreach(DirectoryFileEntry e in sourceentries)
{ {
@ -157,7 +178,7 @@ namespace CodeImp.DoomBuilder.IO
// The given file path must not be absolute // The given file path must not be absolute
public DirectoryFileEntry GetFileInfo(string filepathname) public DirectoryFileEntry GetFileInfo(string filepathname)
{ {
return entries[filepathname.ToLowerInvariant()]; return entries[filepathname];
} }
//mxd. This returns a list of all wad files (filepathname) //mxd. This returns a list of all wad files (filepathname)