Skip to content
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

Support older .sd2 files #14

Merged
merged 3 commits into from
Sep 28, 2024
Merged

Support older .sd2 files #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f4bd98b
Update to FauFau 1.4.0
Xsear Sep 28, 2024
a2557e7
Update fields.txt
Xsear Sep 28, 2024
1131d26
Misc fixes and enhancements
Xsear Sep 28, 2024
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
2 changes: 1 addition & 1 deletion SDBrowser/Lib/FauFau
Open in desktop
Submodule FauFau updated 5 files
+4 −4 FauFau/FauFau.csproj
+665 −166 FauFau/Formats/StaticDB.cs
+23 −0 FauFau/Util/Common.cs
+6 −2 Tests/Program.cs
+96 −0 Tests/SDBTests.cs
2 changes: 1 addition & 1 deletion SDBrowser/PgDB/PGImportExport.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ private void SetMeta(List<TableMeta> tableMeta)
var dbMeta = new SdbMeta
{
Patch = DB.Patch,
Flags = DB.Flags,
Flags = (uint)DB.Flags,
Timestamp = DB.Timestamp,
FileVersion = (uint)GetInstanceField(DB.GetType(), DB, "fileVersion"),
TableVersion = (uint)GetInstanceField(DB.GetType(), DB, "tableVersion")
Expand Down
205 changes: 120 additions & 85 deletions SDBrowser/SDBrowser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
using static FauFau.Formats.StaticDB;
using System.Text.RegularExpressions;
using System.Text.Json;
using FauFau.Util;
using Color = System.Drawing.Color;


namespace FauFau.SDBrowser {
Expand All @@ -21,11 +23,16 @@ public partial class SDBrowser : Form
private int openTable = -1;

public static Dictionary<uint, string> stringDb = new Dictionary<uint, string>();
public List<string> usedStrings = new List<string>();
public List<string> clearedStrings = new List<string>();
public Dictionary<uint, List<string>> dupes = new Dictionary<uint, List<string>>();

public List<string> approvedStrings = new List<string>();
public HashSet<string> saveableStrings = new HashSet<string>();


private List<string> TableNames = new List<string>();


private Tuple<string, StaticDB.DBType>[] fields;
private int realScroll = 0;
private int gotoRow = -1;
Expand Down Expand Up @@ -150,31 +157,6 @@ public SDBrowser()

LoadTableAndFieldNames();
//LoadDB(@"V:\refall\Firefall\system\db\clientdb.sd2");

/*

int count = 0;
int total = 0;
foreach (var table in sdb)
{
total++;
if(stringDb.ContainsKey(table.Id))
{
count++;
}
foreach(var column in table.Columns)
{
total++;
if (stringDb.ContainsKey(column.Id))
{
count++;
}
}
}

rtbOutput.Text = count + " of " + total + "fieldnames known";

*/
}

public static string ByteArrayToString(byte[] bytes)
Expand All @@ -200,43 +182,108 @@ static IEnumerable<IEnumerable<T>> GetPermutationsWithRept<T>(IEnumerable<T> lis
(t1, t2) => t1.Concat(new T[] { t2 }));
}

private void DebugStringHashCoverage()
{
if (sdb == null) {
return;
}

var sbTables = new StringBuilder();
var sbFields = new StringBuilder();
int missingTables = 0;
int missingFields = 0;
int totalFields = 0;
int totalTables = sdb.Tables.Count;

// Ensure we keep all approved strings
foreach (string str in approvedStrings)
{
saveableStrings.Add(str);
}

// Add any matching strings to saveable
foreach (var table in sdb)
{
if (!stringDb.ContainsKey(table.Id)) {
missingTables++;
sbTables.AppendLine($"{sdb.Tables.IndexOf(table)} - {GetIdAsHex(table.Id)}");
} else {
saveableStrings.Add(GetTableOrFieldName(table.Id));
}
foreach(var column in table.Columns)
{
totalFields++;
if (!stringDb.ContainsKey(column.Id))
{
missingFields++;
sbFields.AppendLine($"{GetTableOrFieldName(table.Id)} - {GetIdAsHex(column.Id)} ({column.Type})");
} else {
saveableStrings.Add(GetTableOrFieldName(column.Id));
}
}
}

var sb = new StringBuilder();
if (saveableStrings.Count > approvedStrings.Count) {
sb.AppendLine($"The test strings contained {saveableStrings.Count - approvedStrings.Count} matches:");
foreach (string str in saveableStrings) {
if (!approvedStrings.Contains(str)) {
sb.AppendLine($"{Checksum.FFnv32(str).ToString("X4")} - {str}");
}
}
sb.AppendLine();
}

if (missingTables > 0) {
sb.AppendLine($"Missing {missingTables} out of {totalTables} table names:");
sb.Append(sbTables.ToString());
sb.AppendLine();
} else {
sb.AppendLine($"All {totalTables} table names filled");
}
if (missingFields > 0) {
sb.AppendLine($"Missing {missingFields} out of {totalFields} field names:");
sb.Append(sbFields.ToString());
sb.AppendLine();
} else {
sb.AppendLine($"All {totalFields} field names filled");
}

rtbOutput.Clear();
rtbOutput.Text = sb.ToString();
}

private void LoadDB(string filePath)
{
if (File.Exists(filePath))
{
// clear
// Clear
lbTables.Items.Clear();
dgvRows.Rows.Clear();
dgvRows.Columns.Clear();
TableNames.Clear();
ClearInspector();

// load the new db
// Load the new db
sdb = new StaticDB();
sdb.Read(filePath);

// Display basic info
lblPatch.Text = "Patch: " + sdb.Patch;
lblFlags.Text = "Flags: " + sdb.Flags;
lblCreated.Text = "Created: " + sdb.Timestamp.ToString() + " UTC";
lblLoaded.Text = filePath;

int x = 0;
int y = 0;
// Load table names into table list
for (int i = 0; i < sdb.Count(); i++)
{
string hex = GetIdAsHex(sdb[i].Id);
if(!hex.Equals(GetTableOrFieldName(sdb[i].Id)))
{
x++;
}
y++;

var name = i.ToString().PadRight(8) + GetTableOrFieldName(sdb[i].Id);
TableNames.Add(name);
lbTables.Items.Add(name);
}

Console.WriteLine(x + " / " + y);
// Debug hash coverage
DebugStringHashCoverage();
}
}

Expand Down Expand Up @@ -274,65 +321,49 @@ private void ClearInspector()
}
}

private void LoadTableAndFieldNames()
private void AddStringsToStringDB(List<string> strings)
{
if (File.Exists("fields.txt"))
foreach (string str in strings)
{
usedStrings = File.ReadAllLines("fields.txt").ToList();
clearedStrings = File.ReadAllLines("fields.txt").ToList();
uint key = FauFau.Util.Checksum.FFnv32(str);

foreach (string str in usedStrings)
if (!stringDb.ContainsKey(key))
{
uint key = FauFau.Util.Checksum.FFnv32(str);

if (!stringDb.ContainsKey(key))
stringDb.Add(key, str);
dupes.Add(key, new List<string>());
dupes[key].Add(str);
}
else
{
if (!str.Equals(stringDb[key]))
{
stringDb.Add(key, str);
dupes.Add(key, new List<string>());
Console.WriteLine("Collision: " + key + " : " + stringDb[key] + ", " + str);
dupes[key].Add(str);
}
else
{
if (!str.Equals(stringDb[key]))
{
Console.WriteLine("collision: " + key + " : " + stringDb[key] + ", " + str);
dupes[key].Add(str);
}
}

}

}
}

/*
if (File.Exists("console.log"))
private void LoadTableAndFieldNames()
{
// fields.txt holds strings we are confident have valid matches in some databases
// All of them will be added to the StringDB first.
if (File.Exists("fields.txt"))
{
string log = File.ReadAllText("console.log");
usedStrings = log.Split(new char[] {' ', '\n' }).ToList();
approvedStrings = File.ReadAllLines("fields.txt").ToList();
AddStringsToStringDB(approvedStrings);

foreach (string stra in usedStrings)
{
string str = stra.Trim().Replace("'", "");
uint key = FauFau.Util.Checksum.FFnv32(str);

if (!stringDb.ContainsKey(key))
{
stringDb.Add(key, str);
dupes.Add(key, new List<string>());
dupes[key].Add(str);
Console.WriteLine(str + "\n");
}
else
{
if (!str.Equals(stringDb[key]))
{
Console.WriteLine("collision: " + key + " : " + stringDb[key] + ", " + str);
dupes[key].Add(str);
}
}
// Not sure what these are for so keeping them
clearedStrings = File.ReadAllLines("fields.txt").ToList();
}

}
// test-fields.txt can be used to add additional strings you want include for testing
if (File.Exists("test-fields.txt"))
{
List<string> testStrings = File.ReadAllLines("test-fields.txt").ToList();
AddStringsToStringDB(testStrings);
}
*/
}
private void OpenTable(int index)
{
Expand Down Expand Up @@ -1573,6 +1604,7 @@ private void Form1_Load(object sender, EventArgs e)

private void btnDecrypt_Click(object sender, EventArgs e)
{
rtbOutput.Clear();

uint key;
if(uint.TryParse(tbxDecrypt.Text, out key))
Expand Down Expand Up @@ -1715,8 +1747,11 @@ private void dgvRows_ColumnHeaderMouseDoubleClick(object sender, DataGridViewCel
private void btnGetHash_Click(object sender, EventArgs e)
{
rtbOutput.Clear();
rtbOutput.Text = "Hashing string : " + tbxDecrypt.Text + "\n";
//rtbOutput.Text += "Result : 0x" + StaticDB.FFnv32(tbxDecrypt.Text).ToString("X4");
rtbOutput.Text = "Hashing: " + tbxDecrypt.Text + "\n";
rtbOutput.Text += "Result: 0x" + Checksum.FFnv32(tbxDecrypt.Text).ToString("X4");

// DebugStringHashCoverage();
// File.WriteAllLines("saved-fields.txt", saveableStrings);
}

private void lvTables_VisibleChanged(object sender, EventArgs e)
Expand Down
Loading
Loading