FullKey: equality members, GetHashCode

Author: neptuwunium

TACTLib/Client/ClientHandler.cs

@@ -148,7 +148,7 @@ public ClientHandler(string? basePath, ClientCreateArgs createArgs) {
                 } else {
                     ngdpClient = new NGDPClient(CreateArgs.OnlineRootHost);
                 }
-                
+
                 using var _ = new PerfCounter("NGDPClientBase::CreateInstallationInfo`string`string");
                 var installationInfoData = ngdpClient.CreateInstallationInfo(GetProduct()!, CreateArgs.OnlineRegion);
                 InstallationInfo = new InstallationInfo(installationInfoData);
@@ -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, OpenCKey(ConfigHandler.BuildConfig.Root.ContentKey)!);
+            return ProductHandlerFactory.GetHandler(Product, this, ConfigHandler.BuildConfig.Root.ContentKey == default ? null : OpenCKey(ConfigHandler.BuildConfig.Root.ContentKey)!);
         }
 
         private bool CanShareCDNData([NotNullWhen(true)] ClientHandler? other) {
@@ -258,14 +258,14 @@ private bool CanShareCDNData([NotNullWhen(true)] ClientHandler? other) {
             }
             return archivesMatch;
         }
-        
+
         private static bool CanShareCDNData(CDNConfig cdnConfig, CDNConfig otherCDNConfig) {
             if (otherCDNConfig.Archives.Count != cdnConfig.Archives.Count) return false;
-            
+
             for (var i = 0; i < cdnConfig.Archives.Count; i++) {
                 if (otherCDNConfig.Archives[i] != cdnConfig.Archives[i]) return false;
             }
-            
+
             return true;
         }
 

TACTLib/Core/Key/FullKey.cs

@@ -15,7 +15,7 @@ namespace TACTLib.Core.Key {
     [InlineArray(CASC_FULL_KEY_SIZE)]
     [DebuggerDisplay("{ToHexString()}")]
     [SuppressMessage("ReSharper", "UseSymbolAlias")]
-    public struct FullKey : IComparable<FullKey> {
+    public struct FullKey : IComparable<FullKey>, IEquatable<FullKey> {
         // ReSharper disable once InconsistentNaming
         /// <summary>Content Key size, in bytes</summary>
         public const int CASC_FULL_KEY_SIZE = 16;
@@ -74,5 +74,22 @@ public static int FullKeyCompare(FullKey left, FullKey right) {
             var rightU1 = BinaryPrimitives.ReadUInt64BigEndian(rightSpan.Slice(8));
             return leftU1.CompareTo(rightU1);
         }
+
+        public bool Equals(FullKey other) {
+            var span = MemoryMarshal.Cast<byte, ulong>(this);
+            var otherSpan = MemoryMarshal.Cast<byte, ulong>(this);
+            return span[0] == otherSpan[0] && span[1] == otherSpan[1];
+        }
+
+        public override bool Equals(object? obj) => obj is FullKey other && Equals(other);
+
+        public static bool operator ==(FullKey left, FullKey right) => left.Equals(right);
+        public static bool operator !=(FullKey left, FullKey right) => !(left == right);
+
+        public override int GetHashCode() {
+            var h = new HashCode();
+            h.AddBytes(this);
+            return h.ToHashCode();
+        }
     }
-}
+}

TACTLib/Core/Product/ProductHandlerFactory.cs

@@ -11,7 +11,7 @@ namespace TACTLib.Core.Product {
     public static class ProductHandlerFactory {
         private static readonly Dictionary<TACTProduct, Type> _handlers = new Dictionary<TACTProduct, Type>();
 
-        public static IProductHandler? GetHandler(TACTProduct product, ClientHandler client, Stream root) {
+        public static IProductHandler? GetHandler(TACTProduct product, ClientHandler client, Stream? root) {
             var handlerType = GetHandlerType(product);
             if (handlerType == null) return null;