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

(AutoEntry): file type detection moved to separate method.

Browse Source
This commit is contained in:
morkt 2016-01-18 20:27:40 +04:00
parent 15d17e80be
commit bb49a1376a
2 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
ArcFormats/ArcCommon.cs
View File

@ -57,14 +57,26 @@ namespace GameRes.Formats
public static AutoEntry Create (ArcView file, long offset, string base_name) public static AutoEntry Create (ArcView file, long offset, string base_name)
{ {
return new AutoEntry (base_name, () => { return new AutoEntry (base_name, () => DetectFileType (file, offset)) { Offset = offset };
uint signature = file.View.ReadUInt32 (offset); }
if (0 == signature) return null;
var res = FormatCatalog.Instance.LookupSignature (signature); public static IResource DetectFileType (ArcView file, long offset)
if (!res.Any() || res.Skip (1).Any()) // Count == 0 || Count > 1 {
return null; uint signature = file.View.ReadUInt32 (offset);
return res.First(); if (0 == signature) return null;
}) { Offset = offset }; // resolve some special cases first
if (s_OggFormat.Value.Signature == signature)
return s_OggFormat.Value;
if (AudioFormat.Wav.Signature == signature)
return AudioFormat.Wav;
if (0x4D42 == (signature & 0xFFFF)) // 'BM'
return ImageFormat.Bmp;
var res = FormatCatalog.Instance.LookupSignature (signature);
if (!res.Any())
return null;
if (res.Skip (1).Any()) // type is ambiguous
return null;
return res.First();
} }
private string GetName (string name) private string GetName (string name)
@ -81,6 +93,8 @@ namespace GameRes.Formats
{ {
return null == m_res.Value ? "" : m_res.Value.Type; return null == m_res.Value ? "" : m_res.Value.Type;
} }
static readonly Lazy<AudioFormat> s_OggFormat = new Lazy<AudioFormat> (() => FormatCatalog.Instance.AudioFormats.FirstOrDefault (x => x.Tag == "OGG"));
} }
public class PrefixStream : Stream public class PrefixStream : Stream

2
ArcFormats/TopCat/ArcTCD3.cs
View File

@ -60,7 +60,7 @@ namespace GameRes.Formats.TopCat
Offset = offset; Offset = offset;
} }
private static IResource DetectFileType (ArcView file, long offset) new private static IResource DetectFileType (ArcView file, long offset)
{ {
uint signature = file.View.ReadUInt32 (offset); uint signature = file.View.ReadUInt32 (offset);
return FormatCatalog.Instance.LookupSignature (signature).FirstOrDefault(); return FormatCatalog.Instance.LookupSignature (signature).FirstOrDefault();