Add TLFDBX support, upgrade to net10

Author: DaZombieKiller

TalesOfTools.sln

@@ -0,0 +1,5 @@
+<Solution>
+  <Folder Name="/tools/">
+    <Project Path="tools/TLTool/TLTool.csproj" />
+  </Folder>
+</Solution>

TalesOfTools.slnx

@@ -49,7 +49,7 @@ public void Execute(InvocationContext context)
             mapper = new TLDataNameDictionary();
         }
 
-        mapper.AddNamesFromFile(context.ParseResult.GetValueForArgument(FileDictionaryPath));
+        mapper.AddNamesFromList(context.ParseResult.GetValueForArgument(FileDictionaryPath));
         var entriesNamed = 0;
         var longestExtension = "Type".Length;
         int longestCount = int.Max(data.Entries.Count.ToString().Length, "Count".Length);

tools/TLTool/Commands/AnalyzeNamesCommand.cs

@@ -42,7 +42,7 @@ public void Execute(InvocationContext context)
         AddNamesFromDependFiles(header, mapper, bigEndian, is32Bit);
         BruteForceDependFromPhysical(header, mapper, "TOTEXB_D", "TOTEXP_P");
         BruteForceDependFromPhysical(header, mapper, "TOMDLB_D", "TOMDLP_P");
-        mapper.Write(Console.Out);
+        mapper.WriteNameList(Console.Out);
     }
 
     private static void AddNamesFromDependFiles(TLDataHeader header, TLDataNameDictionary mapper, bool bigEndian, bool is32Bit)
@@ -51,7 +51,13 @@ private static void AddNamesFromDependFiles(TLDataHeader header, TLDataNameDicti
         {
             if (entry.Extension.EndsWith("_D", StringComparison.OrdinalIgnoreCase))
             {
-                AddNamesFromDependFile(entry, mapper, bigEndian, is32Bit);
+                try
+                {
+                    AddNamesFromDependFile(entry, mapper, bigEndian, is32Bit);
+                }
+                catch
+                {
+                }
             }
         }
     }

tools/TLTool/Commands/DumpNamesCommand.cs

@@ -30,7 +30,7 @@ public void Execute(InvocationContext context)
         var mapper = new TLDataNameDictionary();
         var is32Bit = context.ParseResult.GetValueForOption(Is32Bit);
         var bigEndian = context.ParseResult.GetValueForOption(IsBigEndian);
-        mapper.AddNamesFromFile(context.ParseResult.GetValueForArgument(FileDictionaryPath)!);
+        mapper.AddNamesFromList(context.ParseResult.GetValueForArgument(FileDictionaryPath)!);
 
         using (var stream = File.OpenRead(context.ParseResult.GetValueForArgument(HeaderPath)))
             header.ReadFrom(new BinaryStream(stream, bigEndian), is32Bit);

tools/TLTool/Commands/ListNamesCommand.cs

@@ -0,0 +1,33 @@
+using System.CommandLine;
+using System.CommandLine.Invocation;
+
+namespace TLTool;
+
+public sealed class MergeFileMapsCommand
+{
+    public Command Command { get; } = new("merge-tlfdbx");
+
+    public Argument<string> OutputPath { get; } = new("output", "Path to output TLFDBX");
+
+    public Argument<string[]> Paths { get; } = new("paths", "Path to each TLFDBX file");
+
+    public MergeFileMapsCommand()
+    {
+        Command.AddArgument(OutputPath);
+        Command.AddArgument(Paths);
+        Handler.SetHandler(Command, Execute);
+    }
+
+    public void Execute(InvocationContext context)
+    {
+        var mapper = new TLDataNameDictionary();
+        var inputs = context.ParseResult.GetValueForArgument(Paths)!;
+        var output = context.ParseResult.GetValueForArgument(OutputPath)!;
+
+        foreach (var input in inputs)
+            mapper.AddNamesFromXml(input);
+
+        using var writer = new StreamWriter(output);
+        mapper.WriteFileDatabase(writer);
+    }
+}

tools/TLTool/Commands/MergeFileMapsCommand.cs

@@ -41,7 +41,7 @@ public void Execute(InvocationContext context)
             data.ReadFrom(new BinaryStream(stream, bigEndian), is32Bit);
 
         if (context.ParseResult.HasOption(Dictionary))
-            mapper.AddNamesFromFile(context.ParseResult.GetValueForOption(Dictionary)!);
+            mapper.AddNamesFromList(context.ParseResult.GetValueForOption(Dictionary)!);
 
         foreach (var entry in data.Entries)
         {

tools/TLTool/Commands/QueryFileCommand.cs

@@ -22,7 +22,7 @@ public QueryNamesCommand()
     public void Execute(InvocationContext context)
     {
         var mapper = new TLDataNameDictionary();
-        mapper.AddNamesFromFile(context.ParseResult.GetValueForArgument(Dictionary));
+        mapper.AddNamesFromList(context.ParseResult.GetValueForArgument(Dictionary));
 
         foreach (string query in context.ParseResult.GetValueForArgument(Hashes))
         {

tools/TLTool/Commands/QueryNamesCommand.cs

@@ -35,7 +35,7 @@ public void Execute(InvocationContext context)
         var mapper = new ZArcNameDictionary(archive.PathCaseConversion);
 
         if (context.ParseResult.HasOption(FileDictionaryPath))
-            mapper.AddNamesFromFile(context.ParseResult.GetValueForOption(FileDictionaryPath)!);
+            mapper.AddNamesFromList(context.ParseResult.GetValueForOption(FileDictionaryPath)!);
 
         Parallel.ForEach(archive.Entries, entry =>
         {

tools/TLTool/Commands/UnZarcCommand.cs

@@ -22,6 +22,8 @@ public sealed class UnpackCommand
 
     public Option<bool> IsBigEndian { get; } = new("--big-endian", "File is big-endian");
 
+    public Option<bool> IsFileMap { get; } = new("--file-map", "Name dictionary is a TLFDBX file");
+
     public UnpackCommand()
     {
         Command.AddArgument(HeaderPath);
@@ -31,6 +33,7 @@ public UnpackCommand()
         Command.AddOption(Is32Bit);
         Command.AddOption(IsBigEndian);
         Command.AddOption(Encrypted);
+        Command.AddOption(IsFileMap);
         Handler.SetHandler(Command, Execute);
     }
 
@@ -54,15 +57,45 @@ public void Execute(InvocationContext context)
             header.ReadFrom(new BinaryStream(stream, bigEndian), new FileInfo(context.ParseResult.GetValueForArgument(TLFilePath)), is32Bit);
 
         if (context.ParseResult.HasOption(FileDictionaryPath))
-            mapper.AddNamesFromFile(context.ParseResult.GetValueForOption(FileDictionaryPath)!);
+        {
+            var path = context.ParseResult.GetValueForOption(FileDictionaryPath)!;
+            var extension = Path.GetExtension(path);
+
+            if (extension.Equals(".TLFDBX", StringComparison.OrdinalIgnoreCase) || context.ParseResult.GetValueForOption(IsFileMap))
+            {
+                mapper.AddNamesFromXml(path);
+            }
+            else
+            {
+                mapper.AddNamesFromList(path);
+            }
+        }
 
         Parallel.ForEach(header.Entries, entry =>
         {
             var name = mapper.GetNameOrFallback(entry.NameHash, entry.Extension);
-            Directory.CreateDirectory(Path.Combine(output, entry.Extension));
-            using var source = GetStream((TLFileDataSource)entry.DataSource, encrypt);
-            using var stream = File.Create(Path.Combine(output, entry.Extension, name));
-            source.CopyTo(stream);
+            var path = Path.Combine(Path.Combine(output, entry.Extension), name);
+            var time = 0L;
+
+            if (mapper.TryGetFileMap(entry.NameHash, entry.Extension, out var map))
+            {
+                if (!string.IsNullOrEmpty(map.FullPath))
+                    path = Path.Combine(output, map.FullPath.TrimStart('/', '\\'));
+
+                time = map.TimeStamp;
+            }
+
+            Directory.CreateDirectory(Path.GetDirectoryName(path) ?? output);
+            using (var source = GetStream((TLFileDataSource)entry.DataSource, encrypt))
+            using (var stream = File.Create(path))
+            {
+                source.CopyTo(stream);
+            }
+
+            if (time > 0)
+            {
+                File.SetLastWriteTimeUtc(path, DateTime.FromFileTimeUtc(time));
+            }
         });
     }