Skip to content

Fix OpenKh.Command.Bbsa extraction logic #1263

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ktheticdev wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix OpenKh.Command.Bbsa extraction logic #1263

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c5e7e49
fix Bbsa extract logic
Jun 23, 2026
3be8253
force CI
Jun 23, 2026
8f009ce
Merge branch 'OpenKH:master' into master
ktheticdev Jul 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 39 additions & 1 deletion OpenKh.Bbs/Bbsa.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,7 @@ public class Header
[Data] public int Archive4Sector { get; set; }
public Partition<PartitionFileEntry>[] Partitions { get; set; }
public Directory[] _directories;
public DirectoryEntry[] DirectoryEntries { get; set; } = Array.Empty<DirectoryEntry>();
}

protected class ArchivePartitionHeader
Expand Down Expand Up @@ -252,6 +253,14 @@ internal static Directory Read(Stream stream, int baseOffset, int x, int DirEntr

return dir;
}

internal static DirectoryEntry[] ReadAll(Stream stream, int baseOffset, int DirEntriescount)
{
stream.Position = baseOffset;

return Enumerable.Range(0, DirEntriescount)
.Select(x => DirectoryEntry.Read(stream)).ToArray();
}
}
public class DirectoryEntry
{
Expand Down Expand Up @@ -290,10 +299,10 @@ protected Bbsa(Stream stream)
_header.Partitions = ReadPartitions<PartitionFileEntry>(stream, 0x30, _header.PartitionCount);
ReadPartitionLba(_header.Partitions, stream, _header.PartitionOffset);

_header.DirectoryEntries = Directory.ReadAll(stream, _header.DirectoryOffset, _header.DirectoryEntriesCount);
_header._directories = Enumerable.Range(0, _header.DirectoryCount)
.Select(x => Directory.Read(stream, _header.DirectoryOffset, x, _header.DirectoryEntriesCount, _header.DirectoryCount)).ToArray();


int header2Offset = _header.ArchivePartitionSector * 0x800;
stream.Position = header2Offset;
_header2 = BinaryMapping.ReadObject<ArchivePartitionHeader>(stream);
Expand Down Expand Up @@ -615,9 +624,38 @@ public IEnumerable<Entry> Files
file.Offset==0?0:GetArchiveIndex(_header, file.Offset));
}
}

foreach (var file in GetDirectoryEntryTail())
{
NameDictionary.TryGetValue(file.FileHash, out var fileName);
NameDictionary.TryGetValue(file.DirectoryHash, out var folderName);

yield return new Entry(
this,
file.Offset,
file.Size,
fileName,
"",
folderName,
file.FileHash,
file.DirectoryHash,
(uint)file.LocationOffset,
file.Offset==0?0:GetArchiveIndex(_header, file.Offset));
}
}
}

private IEnumerable<DirectoryEntry> GetDirectoryEntryTail()
{
if (_header.DirectoryCount == 0)
return _header.DirectoryEntries;

int entriesPerDirectory = _header.DirectoryEntriesCount / _header.DirectoryCount;
int groupedEntriesCount = entriesPerDirectory * _header.DirectoryCount;

return _header.DirectoryEntries.Skip(groupedEntriesCount);
}

public int GetOffset(string fileName)
{
var directory = Path.GetDirectoryName(fileName).Replace('\\', '/');
Expand Down