Public-Mirror/GARbro-mirror
1
0
Fork 0
mirror of https://github.com/crskycode/GARbro.git synced 2024-12-24 20:04:13 +08:00
Code Issues Projects Releases Wiki Activity

don't concatenate strings inside lambda expressions.

Browse Source
This commit is contained in:
morkt 2016-05-25 03:07:19 +04:00
parent f1b0c3d6b5
commit ca9126907c
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
GameRes/FileSystem.cs
View File

@ -366,7 +366,8 @@ namespace GameRes
Entry entry = null; Entry entry = null;
if (m_dir.TryGetValue (filename, out entry)) if (m_dir.TryGetValue (filename, out entry))
return entry; return entry;
if (m_dir.Keys.Any (n => n.StartsWith (filename + PathDelimiter))) var dir_name = filename + PathDelimiter;
if (m_dir.Keys.Any (n => n.StartsWith (dir_name)))
return new SubDirEntry (filename); return new SubDirEntry (filename);
throw new FileNotFoundException(); throw new FileNotFoundException();
} }
@ -404,10 +405,10 @@ namespace GameRes
{ {
if (0 == m_cwd.Length) if (0 == m_cwd.Length)
return m_arc.Dir; return m_arc.Dir;
else var path = m_cwd + PathDelimiter;
return from file in m_arc.Dir return from file in m_arc.Dir
where file.Name.StartsWith (m_cwd + PathDelimiter) where file.Name.StartsWith (path)
select file; select file;
} }
public override IEnumerable<Entry> GetFiles (string pattern) public override IEnumerable<Entry> GetFiles (string pattern)
@ -438,9 +439,12 @@ namespace GameRes
else if (".." == entry.Name) // skip reference to parent directory else if (".." == entry.Name) // skip reference to parent directory
continue; continue;
else // add all files contained within directory, recursive else // add all files contained within directory, recursive
{
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 (entry.Name+PathDelimiter) where file.Name.StartsWith (dir_name)
select file); select file);
}
} }
return result; return result;
} }
@ -482,7 +486,8 @@ namespace GameRes
string new_path = string.Join (PathDelimiter, cur_dir); string new_path = string.Join (PathDelimiter, cur_dir);
if (0 != new_path.Length) if (0 != new_path.Length)
{ {
var entry = m_arc.Dir.FirstOrDefault (e => e.Name.StartsWith (new_path + PathDelimiter)); var dir_name = new_path + PathDelimiter;
var entry = m_arc.Dir.FirstOrDefault (e => e.Name.StartsWith (dir_name));
if (null == entry) if (null == entry)
throw new DirectoryNotFoundException(); throw new DirectoryNotFoundException();
} }