Properly extract .tobj entries in HashFS v2

Extractor/Extractor.csproj

@@ -1,20 +1,21 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
- <PropertyGroup>
- <OutputType>Exe</OutputType>
- <TargetFramework>net6.0</TargetFramework>
- <AssemblyName>extractor</AssemblyName>
- <RootNamespace>Extractor</RootNamespace>
- <PublishSingleFile>true</PublishSingleFile>
- <SelfContained>true</SelfContained>
- </PropertyGroup>
+ <PropertyGroup>
+ <OutputType>Exe</OutputType>
+ <TargetFramework>net6.0</TargetFramework>
+ <AssemblyName>extractor</AssemblyName>
+ <RootNamespace>Extractor</RootNamespace>
+ <PublishSingleFile>true</PublishSingleFile>
+ <SelfContained>true</SelfContained>
+ <Version>2024.07.04</Version>
+ </PropertyGroup>
 
- <ItemGroup>
- <PackageReference Include="Mono.Options" Version="6.12.0.148" />
- </ItemGroup>
+ <ItemGroup>
+ <PackageReference Include="Mono.Options" Version="6.12.0.148" />
+ </ItemGroup>
 
- <ItemGroup>
- <ProjectReference Include="..\TruckLib\TruckLib.HashFs\TruckLib.HashFs.csproj" />
- </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\TruckLib\TruckLib.HashFs\TruckLib.HashFs.csproj" />
+ </ItemGroup>
 
 </Project>

Extractor/Program.cs

@@ -11,6 +11,8 @@ namespace Extractor
 {
  class Program
  {
+ const string Version = "2024-07-04";
+
  static string destination = "./extracted/";
  static bool skipIfExists = false;
  static bool forceEntryTableAtEnd = false;
@@ -44,7 +46,7 @@ static void Main(string[] args)
  "-p=/def,/map\n" +
  "-p=/def/world/road.sii",
  x => { startPaths = x.Split(","); } },
- { "paths=",
+ { "P=|paths=",
  "Same as --partial, but expects a text file containing paths to extract, " +
  "separated by newlines.",
  x => { startPaths = LoadStartPathsFromFile(x); } },
@@ -80,7 +82,7 @@ static void Main(string[] args)
 
  if (printHelp || args.Length == 0)
  {
- Console.WriteLine("Extractor 2024-04-18\n");
+ Console.WriteLine($"Extractor {Version}\n");
  Console.WriteLine("Usage:\n extractor path... [options]\n");
  Console.WriteLine("Options:");
  p.WriteOptionDescriptions(Console.Out);
@@ -241,7 +243,7 @@ private static void ExtractRaw(string scsPath)
 
  try
  {
- reader.ExtractToFile(entry, outputPath);
+ reader.ExtractToFile(entry, key.ToString("x"), outputPath);
  } 
  catch (ZlibException zlex)
  {
@@ -308,8 +310,18 @@ private static void ExtractFiles(IHashFsReader reader, List<string> files)
  }
  catch (ZlibException zlex)
  {
- Console.WriteLine($"Unable to extract entry {file}:");
- Console.WriteLine(zlex.Message);
+ Console.Error.WriteLine($"Unable to extract entry {file}:");
+ Console.Error.WriteLine(zlex.Message);
+ }
+ catch (InvalidDataException idex)
+ {
+ Console.Error.WriteLine($"Unable to extract entry {file}:");
+ Console.Error.WriteLine(idex.Message);
+ }
+ catch (AggregateException agex)
+ {
+ Console.Error.WriteLine($"Unable to extract entry {file}:");
+ Console.Error.WriteLine(agex.ToString());
  }
  }
  }

README.md

@@ -1,11 +1,12 @@
 ## Extractor
-A cross-platform .scs (HashFS) extractor written in C#. Supports raw dumps, partial extraction, and extracting all .scs files at once.
+A cross-platform .scs (HashFS) extractor written in C#. Supports raw dumps, partial extraction,
+and extracting all .scs files at once.
 
-HashFS v2, introduced with game version 1.50, is supported, with one limitation: the packed .tobj format, which
-.tobj/.dds pairs are converted to in v2, can be extracted, but not unpacked.
+HashFS v2, introduced with game version 1.50, is supported.
 
 ## Build
-A self-contained binary for Windows is available on the Releases page. On other platforms, install the .NET 6 SDK and run the following:
+A self-contained binary for Windows is available on the Releases page. On other platforms, install the
+.NET 6 (or higher) SDK and run the following:
 ```sh
 git clone https://github.com/sk-zk/Extractor.git --recursive
 cd Extractor
@@ -14,7 +15,8 @@ dotnet publish -c Release
 
 ## Usage
 ```
-extractor path... [options]
+Usage:
+ extractor path... [options]
 
 Options:
  -a, --all Extracts all .scs archives in the specified
@@ -26,7 +28,7 @@ Options:
  -p=/map
  -p=/def,/map
  -p=/def/world/road.sii
-   --paths=VALUE Same as --partial, but expects a text file
+ -P, --paths=VALUE Same as --partial, but expects a text file
  containing paths to extract, separated by
  newlines.
  -r, --raw Directly dumps the contained files with their
@@ -39,13 +41,9 @@ Options:
  this one instead.
  -s, --skip-existing Don't overwrite existing files.
  --table-at-end [HashFS v1 only] Ignores what the archive header
- says and readsthe entry table from the end of
+ says and reads the entry table from the end of
  the file.
  --tree Prints the directory tree and exits. Can be
  combined with --partial, --paths, and --all.
  -?, -h, --help Prints this message and exits.
 ```
-
-## Dependencies
-* [Mono.Options](https://www.nuget.org/packages/Mono.Options/)
-* [TruckLib.HashFs](https://github.com/sk-zk/TruckLib/)