oops

Author: neptuwunium

TACTLib/Core/EncodingHandler.cs

@@ -30,7 +30,7 @@ public EncodingHandler(ClientHandler client) : this(client,
         public EncodingHandler(ClientHandler client, FullEKey eKey, int eSize) : this(client.OpenEKey(eKey, eSize))
         {
         }
-        
+
         public EncodingHandler(Stream? stream, bool leaveOpen=false)
         {
             ArgumentNullException.ThrowIfNull(stream);
@@ -56,7 +56,7 @@ public EncodingHandler(Stream? stream, bool leaveOpen=false)
             CKeyEKeyHeaderKeys = cKeyEKeyHeaders.Select(x => x.FirstKey).ToArray();
             CKeyEKeyPages_CKeys = new LinearCKeyEntry[cKeyEKeyHeaders.Length][];
             CKeyEKeyPages_EKeys = new FullEKey[cKeyEKeyHeaders.Length][][];
-            
+
             for (var pageIdx = 0; pageIdx < cKeyEKeyHeaders.Length; pageIdx++) {
                 var page = new byte[cKeyEKeyPageSize * 1024];
                 stream.DefinitelyRead(page);
@@ -69,27 +69,27 @@ public EncodingHandler(Stream? stream, bool leaveOpen=false)
                 var pageEntryCount = page.Length / structSize; // (approx)
                 CKeyEKeyPages_CKeys[pageIdx] = new LinearCKeyEntry[pageEntryCount];
                 CKeyEKeyPages_EKeys[pageIdx] = new FullEKey[pageEntryCount][];
-                
+
                 var pageSpan = (ReadOnlySpan<byte>)page;
                 var entryIdx = 0;
                 while (true) {
                     if (pageSpan.Length < structSize) break;
                     var foundEntry = SpanHelper.ReadStruct<CKeyEKeyEntry>(ref pageSpan);
                     if (foundEntry.EKeyCount == 0) break; // end
-                    
+
                     var ekeyArray = SpanHelper.ReadArray<FullEKey>(ref pageSpan, foundEntry.EKeyCount);
-                    
+
                     CKeyEKeyPages_CKeys[pageIdx][entryIdx] = new LinearCKeyEntry {
                         CKey = foundEntry.CKey,
                         ContentSize = foundEntry.ContentSize
                     };
                     CKeyEKeyPages_EKeys[pageIdx][entryIdx] = ekeyArray.ToArray();
                     entryIdx++;
                 }
-                
+
                 CKeyEKeyPages_CKeys[pageIdx] = CKeyEKeyPages_CKeys[pageIdx].AsSpan(0, entryIdx).ToArray();
             }
-            
+
             var eKeyESpecPageSize = header.m_eKeyESpecPageSize.ToInt();
             var eKeyEspecPageCount = header.m_eKeyEspecPageCount.ToInt();
             var eKeyESpecHeaders = reader.ReadArray<PageHeader>((int)eKeyEspecPageCount);
@@ -98,7 +98,7 @@ public EncodingHandler(Stream? stream, bool leaveOpen=false)
             for (var pageIdx = 0; pageIdx < eKeyESpecHeaders.Length; pageIdx++) {
                 var page = new byte[eKeyESpecPageSize * 1024];
                 stream.DefinitelyRead(page);
-                
+
                 var entries = MemoryMarshal.Cast<byte, EKeyESpecEntry>(page);
                 for (var entryIdx = 0; entryIdx < entries.Length; entryIdx++)
                 {
@@ -113,15 +113,15 @@ public EncodingHandler(Stream? stream, bool leaveOpen=false)
 
         private bool FindCKey(CKey cKey, out int pageIndex, out int foundIndex) {
             var searchResult = Array.BinarySearch(CKeyEKeyHeaderKeys, cKey);
-            
+
             if (searchResult >= 0) {
                 pageIndex = searchResult;
             } else {
                 var firstElementLarger = ~searchResult;
                 pageIndex = firstElementLarger - 1;
                 if (pageIndex < 0) goto NOT_FOUND;
             }
-            
+
             var speculativeEntry = new LinearCKeyEntry {
                 CKey = cKey
             };
@@ -131,7 +131,7 @@ private bool FindCKey(CKey cKey, out int pageIndex, out int foundIndex) {
             if (foundIndex >= 0) {
                 return true;
             }
-            
+
             NOT_FOUND:
             foundIndex = 0;
             pageIndex = 0;
@@ -141,11 +141,13 @@ private bool FindCKey(CKey cKey, out int pageIndex, out int foundIndex) {
         public bool TryGetEncodingEntry(CKey cKey, out ReadOnlySpan<FullEKey> entry) {
             if (!FindCKey(cKey, out var pageIndex, out var foundIndex)) {
                 entry = Array.Empty<FullEKey>();
-                Logger.Debug(nameof(EncodingHandler), $"Unable to get EKey for {cKey.ToHexString()} (This is okay, can be due to bundle encryption)");
+                if (cKey != default) {
+                    Logger.Debug(nameof(EncodingHandler), $"Unable to get EKey for {cKey.ToHexString()} (This is okay, can be due to bundle encryption)");
+                }
                 //Console.Out.WriteLine($"cant get ekey for {cKey.ToHexString()}. a o");
                 return false;
             }
-            
+
             entry = CKeyEKeyPages_EKeys[pageIndex][foundIndex];
             return true;
         }
@@ -203,11 +205,11 @@ public IEnumerable<string> GetESpecs() {
                 var terminatorIdx = span.IndexOf((byte)0);
                 Debug.Assert(terminatorIdx != -1);
                 Debug.Assert(terminatorIdx != 0);
-                
+
                 var especAscii = span.Slice(0, terminatorIdx);
                 var espec = Encoding.ASCII.GetString(especAscii);
                 yield return espec;
-                
+
                 pos += terminatorIdx + 1;
             }
         }
@@ -257,7 +259,7 @@ public int CompareTo(CKeyEKeyEntry other) {
                 return CKey.CompareTo(other.CKey);
             }
         }
-        
+
         private struct LinearCKeyEntry : IComparable<LinearCKeyEntry> {
             public CKey CKey;
             public UInt32BE ContentSize;
@@ -267,4 +269,4 @@ public int CompareTo(LinearCKeyEntry other) {
             }
         }
     }
-}
+}

TACTLib/Core/Key/FullKey.cs

@@ -77,7 +77,7 @@ public static int FullKeyCompare(FullKey left, FullKey right) {
 
         public bool Equals(FullKey other) {
             var span = MemoryMarshal.Cast<byte, ulong>(this);
-            var otherSpan = MemoryMarshal.Cast<byte, ulong>(this);
+            var otherSpan = MemoryMarshal.Cast<byte, ulong>(other);
             return span[0] == otherSpan[0] && span[1] == otherSpan[1];
         }