Public-Mirror/GARbro-mirror
1
0
Fork 0
mirror of https://github.com/crskycode/GARbro.git synced 2024-10-23 07:38:16 +08:00
Code Issues Projects Releases Wiki Activity

(GRP): reworked file type detection.

Browse Source
This commit is contained in:
morkt 2018-06-19 14:09:47 +04:00
parent 4981ed2252
commit f215b8d5d3
1 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
ArcFormats/Ankh/ArcGRP.cs
View File

@ -42,7 +42,7 @@ namespace GameRes.Formats.Ankh
public GrpOpener () public GrpOpener ()
{ {
Extensions = new string[] { "grp", "bin" }; Extensions = new string[] { "grp", "bin", "dat", "vc" };
} }
public override ArcFile TryOpen (ArcView file) public override ArcFile TryOpen (ArcView file)
@ -83,13 +83,15 @@ namespace GameRes.Formats.Ankh
void DetectFileTypes (ArcView file, List<Entry> dir) void DetectFileTypes (ArcView file, List<Entry> dir)
{ {
var header = new byte[16];
foreach (PackedEntry entry in dir) foreach (PackedEntry entry in dir)
{ {
if (entry.Size <= 8) if (entry.Size <= 8)
continue; continue;
if (file.View.AsciiEqual (entry.Offset, "TPW")) file.View.Read (entry.Offset, header, 0, 16);
if (header.AsciiEqual ("TPW"))
{ {
entry.IsPacked = file.View.ReadByte (entry.Offset+3) != 0; entry.IsPacked =header[3] != 0;
long start_offset = entry.Offset+4; long start_offset = entry.Offset+4;
if (entry.IsPacked) if (entry.IsPacked)
{ {
@ -104,40 +106,48 @@ namespace GameRes.Formats.Ankh
if (file.View.AsciiEqual (start_offset, "BM")) if (file.View.AsciiEqual (start_offset, "BM"))
entry.ChangeType (ImageFormat.Bmp); entry.ChangeType (ImageFormat.Bmp);
} }
else if (file.View.AsciiEqual (entry.Offset+4, "HDJ\0")) else if (header.AsciiEqual (4, "HDJ\0"))
{ {
if (file.View.AsciiEqual (entry.Offset+12, "BM")) if (header.AsciiEqual (12, "BM"))
entry.ChangeType (ImageFormat.Bmp); entry.ChangeType (ImageFormat.Bmp);
else if (file.View.AsciiEqual (entry.Offset+12, "MThd")) else if (header.AsciiEqual (12, "MThd"))
entry.Name = Path.ChangeExtension (entry.Name, "mid"); entry.Name = Path.ChangeExtension (entry.Name, "mid");
entry.UnpackedSize = file.View.ReadUInt32 (entry.Offset); entry.UnpackedSize = header.ToUInt32 (0);
entry.IsPacked = true; entry.IsPacked = true;
} }
else if (file.View.AsciiEqual (entry.Offset+4, "OggS")) else if (header.AsciiEqual (4, "OggS"))
{ {
entry.ChangeType (OggAudio.Instance); entry.ChangeType (OggAudio.Instance);
entry.Offset += 4; entry.Offset += 4;
entry.Size -= 4; entry.Size -= 4;
} }
else if (entry.Size > 12 && file.View.AsciiEqual (entry.Offset+8, "RIFF")) else if (entry.Size > 12 && header.AsciiEqual (8, "RIFF"))
{ {
entry.ChangeType (AudioFormat.Wav); entry.ChangeType (AudioFormat.Wav);
entry.UnpackedSize = file.View.ReadUInt32 (entry.Offset); entry.UnpackedSize = header.ToUInt32 (0);
entry.IsPacked = true; entry.IsPacked = true;
} }
else if (file.View.AsciiEqual (entry.Offset, "BM")) else if (header.AsciiEqual ("BM"))
{ {
entry.ChangeType (ImageFormat.Bmp); entry.ChangeType (ImageFormat.Bmp);
} }
else if (file.View.AsciiEqual (entry.Offset, "RIFF")) else if (header.AsciiEqual ("RIFF"))
{ {
entry.ChangeType (AudioFormat.Wav); entry.ChangeType (AudioFormat.Wav);
} }
else if (file.View.AsciiEqual (entry.Offset, "\x89PNG")) else if (header.AsciiEqual ("\x89PNG"))
{ {
entry.ChangeType (ImageFormat.Png); entry.ChangeType (ImageFormat.Png);
} }
else if (header.ToUInt32 (0) == 0xE0FFD8FF)
{
entry.ChangeType (ImageFormat.Jpeg);
}
else if (header.ToUInt16 (0) == 0xFBFF)
{
entry.ChangeType (Mp3Format.Value);
}
else if (entry.Size > 0x16 && IsAudioEntry (file, entry)) else if (entry.Size > 0x16 && IsAudioEntry (file, entry))
{ {
entry.Type = "audio"; entry.Type = "audio";
@ -145,6 +155,8 @@ namespace GameRes.Formats.Ankh
} }
} }
internal static ResourceInstance<AudioFormat> Mp3Format = new ResourceInstance<AudioFormat> ("MP3");
bool IsAudioEntry (ArcView file, Entry entry) bool IsAudioEntry (ArcView file, Entry entry)
{ {
uint signature = file.View.ReadUInt32 (entry.Offset); uint signature = file.View.ReadUInt32 (entry.Offset);