lifegpc/GARbro-crskycode
1
0
Fork 0
mirror of https://github.com/crskycode/GARbro.git synced 2026-06-20 10:55:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

use invariant case conversion methods.

Browse Source
This commit is contained in:
morkt
2014-08-22 10:13:37 +04:00
parent dc9f0ebb44
commit 8a53d74d5e
3 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
GameRes/ArcFile.cs
View File

@@ -64,7 +64,7 @@ namespace GameRes
/// </returns>
public static ArcFile TryOpen (string filename)
{
var ext = new Lazy<string> (() => Path.GetExtension (filename).TrimStart ('.').ToLower());
var ext = new Lazy<string> (() => Path.GetExtension (filename).TrimStart ('.').ToLowerInvariant());
var file = new ArcView (filename);
try
{
@@ -74,7 +74,7 @@ namespace GameRes
var range = FormatCatalog.Instance.LookupSignature<ArchiveFormat> (signature);
// check formats that match filename extension first
if (range.Skip(1).Any()) // if range.Count() > 1
range = range.OrderByDescending (f => f.Extensions.First() == ext.Value);
range = range.OrderByDescending (f => f.Extensions.Any() && f.Extensions.First() == ext.Value);
foreach (var impl in range)
{
try

12
GameRes/GameRes.cs
View File

@@ -109,7 +109,7 @@ namespace GameRes
protected IResource ()
{
m_extensions = new string[] { Tag.ToLower() };
m_extensions = new string[] { Tag.ToLowerInvariant() };
m_signatures = new uint[] { Signature };
}
}
@@ -309,7 +309,7 @@ namespace GameRes
{
foreach (var ext in impl.Extensions)
{
m_extension_map.Add (ext.ToUpper(), impl);
m_extension_map.Add (ext.ToUpperInvariant(), impl);
}
foreach (var signature in impl.Signatures)
{
@@ -325,14 +325,14 @@ namespace GameRes
public IEnumerable<IResource> LookupFileName (string filename)
{
string ext = Path.GetExtension (filename);
if (null == ext)
if (string.IsNullOrEmpty (ext))
return new IResource[0];
return LookupExtension (ext.TrimStart ('.'));
}
public IEnumerable<IResource> LookupExtension (string ext)
{
return m_extension_map.GetValues (ext.ToUpper(), true);
return m_extension_map.GetValues (ext.ToUpperInvariant(), true);
}
public IEnumerable<Type> LookupExtension<Type> (string ext) where Type : IResource
@@ -357,9 +357,9 @@ namespace GameRes
{
Entry entry = null;
string ext = Path.GetExtension (filename);
if (null != ext)
if (!string.IsNullOrEmpty (ext))
{
ext = ext.TrimStart ('.').ToUpper();
ext = ext.TrimStart ('.').ToUpperInvariant();
var range = m_extension_map.GetValues (ext, false);
if (null != range)
entry = range.First().CreateEntry();