simplify

Author: ZingBallyhoo

TACTLib/Client/ClientHandler.cs

@@ -242,7 +242,7 @@ public ClientHandler(string? basePath, ClientCreateArgs createArgs) {
 
         public IProductHandler? CreateProductHandler() {
             using var _ = new PerfCounter("ProductHandlerFactory::GetHandler`TACTProduct`ClientHandler`Stream");
-            return ProductHandlerFactory.GetHandler(Product, this, ConfigHandler.BuildConfig.Root.ContentKey == default ? null : OpenCKey(ConfigHandler.BuildConfig.Root.ContentKey)!);
+            return ProductHandlerFactory.GetHandler(Product, this, OpenCKey(ConfigHandler.BuildConfig.Root.ContentKey));
         }
 
         private bool CanShareCDNData([NotNullWhen(true)] ClientHandler? other) {

TACTLib/Core/Key/FullKey.cs

@@ -76,9 +76,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>(other);
-            return span[0] == otherSpan[0] && span[1] == otherSpan[1];
+            return FullKeyCompare(this, other) == 0;
         }
 
         public override bool Equals(object? obj) => obj is FullKey other && Equals(other);

TACTLib/Core/Key/TruncatedKey.cs

@@ -15,7 +15,7 @@ namespace TACTLib.Core.Key {
     [InlineArray(CASC_TRUNCATED_KEY_SIZE)]
     [DebuggerDisplay("{ToHexString()}")]
     [SuppressMessage("ReSharper", "UseSymbolAlias")]
-    public struct TruncatedKey : IComparable<TruncatedKey> {
+    public struct TruncatedKey : IComparable<TruncatedKey>, IEquatable<TruncatedKey> {
         // ReSharper disable once InconsistentNaming
         /// <summary>Encoding Key size, in bytes</summary>
         public const int CASC_TRUNCATED_KEY_SIZE = 9;
@@ -70,5 +70,20 @@ public static int TruncatedKeyCompare(TruncatedKey left, TruncatedKey right) {
             var rightU1 = MemoryMarshal.Read<byte>(rightSpan.Slice(8));
             return leftU1.CompareTo(rightU1);
         }
+        
+        public bool Equals(TruncatedKey other) {
+            return TruncatedKeyCompare(this, other) == 0;
+        }
+
+        public override bool Equals(object? obj) => obj is TruncatedKey other && Equals(other);
+
+        public static bool operator ==(TruncatedKey left, TruncatedKey right) => left.Equals(right);
+        public static bool operator !=(TruncatedKey left, TruncatedKey right) => !(left == right);
+
+        public override int GetHashCode() {
+            var h = new HashCode();
+            h.AddBytes(this);
+            return h.ToHashCode();
+        }
     }
 }

TACTLib/Protocol/CDNIndexHandler.cs

@@ -225,7 +225,7 @@ private void ParseIndex(Stream stream, int archiveIndex)
                 if (archiveIndex == ARCHIVE_ID_LOOSE) {
                     ReadOnlySpan<LooseFileEntry> pageEntries = MemoryMarshal.Cast<byte, LooseFileEntry>(page);
                     for (var entryIdx = 0; entryIdx < pageEntries.Length; entryIdx++) {
-                        if (pageEntries[entryIdx].m_eKey.CompareTo(default) != 0) {
+                        if (pageEntries[entryIdx].m_eKey != default) {
                             // has value
                             continue;
                         } 
@@ -252,7 +252,7 @@ private void ParseIndex(Stream stream, int archiveIndex)
 
                 for (var entryIdx = 0; entryIdx < maxEntryCount; entryIdx++) {
                     var key = SpanHelper.ReadStruct<FullKey>(ref pageSpan);
-                    if (key.CompareTo(default) == 0) {
+                    if (key == default) {
                         // has no value, end of the list
                         intermediateEntries = intermediateEntries.AsSpan(0, entryIdx).ToArray();
                         break;