Version support/assetdatabase

src/Unity.Cli/Commands_RunAssetDb.cs

@@ -98,12 +98,17 @@ void DumpTables(AssetLmdb db, IEnumerable<TableDumpSpec> specs)
 
                     foreach (var spec in specs)
                     {
+
                         if (!config.OptCombined)
                         {
                             var path = outDir.Combine($"{db.Name}-{spec.TableName}");
                             dump = new DumpContext(path, config);
                         }
 
+                        // Data size in tables can vary with DbVersions. We filter them out here
+                        if (spec.VersionCompatibliity != null && !spec.VersionCompatibliity.Contains(db.DbVersion))
+                            continue;
+
                         db.DumpTable(dump!, db, spec);
 
                         if (!config.OptCombined)

src/Unity.Cli/Unity.Cli.csproj

@@ -41,4 +41,10 @@
     <ProjectReference Include="$(OkSrcRoot)Unity\Unity.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+  <None Include="$(OkSrcRoot)/../native/libspreads_lmdb.dylib">
+    <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+  </None>
+</ItemGroup>
+
 </Project>

src/Unity/AssetDb/AssetLmdb.cs

@@ -21,7 +21,7 @@ public AssetLmdb(NPath dbPath, params uint[] supportedVersions) : base(dbPath)
             var supportedVersionsText = supportedVersions
                 .Select(NiceUint)
                 .StringJoin(", ");
-            throw new InvalidOperationException($"Unsupported {Name} version {NiceUint(DbVersion)} (supported: {supportedVersionsText})");
+            throw new InvalidOperationException($"Unsupported {Name} version {NiceUint(DbVersion)} ({DbVersion}) (supported: {supportedVersionsText})");
         }
     }
 
@@ -94,7 +94,7 @@ public void DumpTable(DumpContext dump, AssetLmdb db, TableDumpSpec spec)
 [UsedImplicitly]
 public record AssetLmdbInfo(string Name, string Version, string[] TableNames);
 
-public record TableDumpSpec(string TableName, string CsvFields, bool UniqueKeys, Action<DumpContext, DirectBuffer, DirectBuffer> Dump);
+public record TableDumpSpec(string TableName, string CsvFields, bool UniqueKeys, uint[]? VersionCompatibliity, Action<DumpContext, DirectBuffer, DirectBuffer> Dump);
 
 public struct DumpConfig
 {

src/Unity/AssetDb/Attributes.cs

@@ -16,6 +16,8 @@ public AssetLmdbTableAttribute(string tableName, string csvFields)
 
     public bool UniqueKeys { get; set; }
 
+    public uint[]? VersionCompatibility { get; set; }
+
     public static TableDumpSpec[] CreateTableDumpSpecs(Type type)
     {
         var expected = new[] { typeof(DumpContext), typeof(DirectBuffer), typeof(DirectBuffer) };
@@ -32,7 +34,7 @@ public static TableDumpSpec[] CreateTableDumpSpecs(Type type)
                     throw new InvalidOperationException($"Method {m.DeclaringType}.{m.Name} is not `void {m.Name}(DumpContext, DirectBuffer, DirectBuffer)`");
 
                 return new TableDumpSpec(
-                    attr._tableName, attr._csvFields, attr.UniqueKeys,
+                    attr._tableName, attr._csvFields, attr.UniqueKeys, attr.VersionCompatibility,
                     (c, k, v) => m.Invoke(null, [c, k, v]));
             })
             .Where(s => s != null)

src/Unity/AssetDb/DirectBufferExtensions.cs

@@ -23,7 +23,7 @@ public static T Read<T>(this ref DirectBuffer @this) where T : unmanaged
     public static T ReadExpectEnd<T>(this in DirectBuffer @this) where T : unmanaged
     {
         if (@this.Length != Unsafe.SizeOf<T>())
-            throw new InvalidOperationException("Did not consume entire value");
+            throw new InvalidOperationException($"Did not consume entire value. Expected {@this.Length}, actual: {Unsafe.SizeOf<T>()}");
 
         return @this.Read<T>(0);
     }

src/Unity/AssetDb/SourceAssetLmdb.cs

@@ -8,7 +8,7 @@ namespace OkTools.Unity.AssetDb;
 
 public static class SourceAssetLmdb
 {
-    static readonly uint[] k_expectedDbVersions = [9, 10, 0x218FD4A3];
+    static readonly uint[] k_expectedDbVersions = [9, 10, 0x218FD4A3, 0xB7728EEA];
     public static AssetLmdb OpenLmdb(NPath projectRoot) =>
         new(projectRoot.Combine(UnityProjectConstants.SourceAssetDbNPath), k_expectedDbVersions);
 
@@ -99,7 +99,7 @@ public static void DumpGuidToPath(DumpContext dump, DirectBuffer key, DirectBuff
             dump.Json!.WriteString(unityGuid.ToString(), path);
     }
 
-    [AssetLmdbTable("hash", "Path,Hash,Time,FileSize,IsUntrusted", UniqueKeys = true)]
+    [AssetLmdbTable("hash", "Path,Hash,Time,FileSize,IsUntrusted", UniqueKeys = true, VersionCompatibility =  [9, 10, 0x218FD4A3])]
     public static void DumpPathToHash(DumpContext dump, DirectBuffer key, DirectBuffer value)
     {
         // HashDB.cpp: HashDB::m_pPathToHash
@@ -122,6 +122,28 @@ public static void DumpPathToHash(DumpContext dump, DirectBuffer key, DirectBuff
         }
     }
 
+    [AssetLmdbTable("hash", "Path,Hash,Time,FileSize,IsUntrusted", UniqueKeys = true, VersionCompatibility =  [0xB7728EEA])]
+    public static void DumpPathToHash2(DumpContext dump, DirectBuffer key, DirectBuffer value)
+    {
+        // HashDB.cpp: HashDB::m_pPathToHash
+
+        var path = key.ToAsciiString();
+        var hash = value.ReadExpectEnd<HashDBValueNoFileSize>();
+
+        if (dump.Csv != null)
+            dump.Csv.Write($"{path},{hash.hash},{hash.TimeAsDateTime},{hash.isUntrusted},");
+        else
+        {
+            dump.Json!.WriteStartObject(path);
+
+            dump.Json.WriteString("Hash", hash.hash.ToString());
+            dump.Json.WriteString("Time", hash.TimeAsDateTime);
+            dump.Json.WriteBoolean("IsUntrusted", hash.isUntrusted);
+
+            dump.Json.WriteEndObject();
+        }
+    }
+
     [AssetLmdbTable("Misc", "Name,Value0,Value1,...", UniqueKeys = true)]
     public static void DumpMisc(DumpContext dump, DirectBuffer key, DirectBuffer value)
     {

src/Unity/AssetDb/SourceAssetLmdbSchema.cs

@@ -55,3 +55,12 @@ struct HashDBValue // Modules/AssetDatabase/Editor/V2/HashDB.h
 
     public DateTime TimeAsDateTime => new(time); // C++ DateTime not binary compatible because extra field in C# version, but easy to convert (they both use the same ticks epoch+resolution)
 }
+
+struct HashDBValueNoFileSize // Modules/AssetDatabase/Editor/V2/HashDB.h
+{
+    public Hash128 hash;
+    public long    time;
+    public bool isUntrusted;
+
+    public DateTime TimeAsDateTime => new(time); // C++ DateTime not binary compatible because extra field in C# version, but easy to convert (they both use the same ticks epoch+resolution)
+}

src/Unity/Unity.cs

@@ -48,7 +48,7 @@ internal static IReadOnlyList<Process> FindUnityProcessesForProject(NPath projec
 
         foreach (var unityProcess in Process.GetProcessesByName(UnityConstants.UnityProcessName))
         {
-            var workingDir = NativeWindows.SafeGetProcessCurrentDirectory(unityProcess.Id)?.ToNPath();
+            var workingDir = "";//NativeWindows.SafeGetProcessCurrentDirectory(unityProcess.Id)?.ToNPath();
             if (workingDir == projectPath)
                 matches.Add(unityProcess);
             else
@@ -63,7 +63,7 @@ internal static IReadOnlyList<Process> FindUnityProcessesForProject(NPath projec
     {
         foreach (var unityProcess in unityProcesses.Where(p => p.MainWindowHandle != default))
         {
-            var unityCommandLine = NativeWindows.SafeGetProcessCommandLine(unityProcess.Id);
+            var unityCommandLine = "";//NativeWindows.SafeGetProcessCommandLine(unityProcess.Id);
             if (unityCommandLine == null)
                 continue;