lifegpc/GARbro-crskycode
1
0
Fork 0
mirror of https://github.com/crskycode/GARbro.git synced 2026-07-08 01:30:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

(FileSystem): changed InvariantCulture comparison to Ordinal.

Browse Source
This commit is contained in:
morkt
2018-01-21 12:00:44 +04:00
parent f819d99c86
commit 7c7dda79c7
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
GameRes/FileSystem.cs
View File

@@ -216,7 +216,7 @@ namespace GameRes
public ArchiveFileSystem (ArcFile arc) public ArchiveFileSystem (ArcFile arc)
{ {
m_arc = arc; m_arc = arc;
m_dir = new Dictionary<string, Entry> (arc.Dir.Count, StringComparer.InvariantCultureIgnoreCase); m_dir = new Dictionary<string, Entry> (arc.Dir.Count, StringComparer.OrdinalIgnoreCase);
foreach (var entry in arc.Dir) foreach (var entry in arc.Dir)
{ {
if (!m_dir.ContainsKey (entry.Name)) if (!m_dir.ContainsKey (entry.Name))
@@ -386,7 +386,7 @@ namespace GameRes
if (!string.IsNullOrEmpty (root_dir)) if (!string.IsNullOrEmpty (root_dir))
root_dir += PathDelimiter; root_dir += PathDelimiter;
var subdirs = new HashSet<string> (StringComparer.InvariantCultureIgnoreCase); var subdirs = new HashSet<string> (StringComparer.OrdinalIgnoreCase);
foreach (var entry in dir) foreach (var entry in dir)
{ {
var match = path_re.Match (entry.Name, root_dir.Length); var match = path_re.Match (entry.Name, root_dir.Length);
@@ -412,7 +412,7 @@ namespace GameRes
return m_arc.Dir; return m_arc.Dir;
var path = m_cwd + PathDelimiter; var path = m_cwd + PathDelimiter;
return from file in m_arc.Dir return from file in m_arc.Dir
where file.Name.StartsWith (path, StringComparison.InvariantCultureIgnoreCase) where file.Name.StartsWith (path, StringComparison.OrdinalIgnoreCase)
select file; select file;
} }
@@ -430,7 +430,7 @@ namespace GameRes
else else
{ {
path += PathDelimiter; path += PathDelimiter;
return m_arc.Dir.Where (f => f.Name.StartsWith (path, StringComparison.InvariantCultureIgnoreCase) return m_arc.Dir.Where (f => f.Name.StartsWith (path, StringComparison.OrdinalIgnoreCase)
&& glob.IsMatch (Path.GetFileName (f.Name))); && glob.IsMatch (Path.GetFileName (f.Name)));
} }
} }
@@ -448,7 +448,7 @@ namespace GameRes
{ {
var dir_name = entry.Name+PathDelimiter; var dir_name = entry.Name+PathDelimiter;
result.AddRange (from file in m_arc.Dir result.AddRange (from file in m_arc.Dir
where file.Name.StartsWith (dir_name, StringComparison.InvariantCultureIgnoreCase) where file.Name.StartsWith (dir_name, StringComparison.OrdinalIgnoreCase)
select file); select file);
} }
} }
@@ -493,7 +493,7 @@ namespace GameRes
if (0 != new_path.Length) if (0 != new_path.Length)
{ {
var dir_name = new_path + PathDelimiter; var dir_name = new_path + PathDelimiter;
var entry = m_arc.Dir.FirstOrDefault (e => e.Name.StartsWith (dir_name, StringComparison.InvariantCultureIgnoreCase)); var entry = m_arc.Dir.FirstOrDefault (e => e.Name.StartsWith (dir_name, StringComparison.OrdinalIgnoreCase));
if (null == entry) if (null == entry)
throw new DirectoryNotFoundException(); throw new DirectoryNotFoundException();
} }
@@ -796,7 +796,7 @@ namespace GameRes
public static bool IsPathEqualsToFileName (string path, string filename) public static bool IsPathEqualsToFileName (string path, string filename)
{ {
// first, filter out completely different paths // first, filter out completely different paths
if (!path.EndsWith (filename, StringComparison.InvariantCultureIgnoreCase)) if (!path.EndsWith (filename, StringComparison.OrdinalIgnoreCase))
return false; return false;
// now, compare length of filename portion of the path // now, compare length of filename portion of the path
int filename_index = path.LastIndexOfAny (PathSeparatorChars); int filename_index = path.LastIndexOfAny (PathSeparatorChars);