Making sure we accept that candidates can be null due to ProtoBuf ini…

…tialization.
AddictedCS · Feb 23, 2024 · 5cdfde3 · 5cdfde3
1 parent 2bd5136
commit 5cdfde3
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/src/SoundFingerprinting/LCS/Candidates.cs b/src/SoundFingerprinting/LCS/Candidates.cs
@@ -14,7 +14,7 @@
     public class Candidates
     {
         [ProtoMember(1)]
-        private readonly ConcurrentDictionary<IModelReference, List<MatchedWith>> candidates;
+        private readonly ConcurrentDictionary<IModelReference, List<MatchedWith>>? candidates;
 
         /// <summary>
         ///  Initializes a new instance of the <see cref="Candidates"/> class.
@@ -27,7 +27,12 @@ public Candidates()
         /// <summary>
         ///  Gets count of candidates.
         /// </summary>
-        public int Count => candidates.Count;
+        public int Count => candidates?.Count ?? 0;
+
+        /// <summary>
+        ///  Gets a value indicating whether candidates are empty.
+        /// </summary>
+        public bool IsEmpty => candidates?.IsEmpty ?? true;
 
         /// <summary>
         ///  Initializes a new instance of the <see cref="Candidates"/> class.
@@ -48,7 +53,7 @@ public Candidates(IModelReference trackReference, IEnumerable<MatchedWith> candi
         /// <returns>Get all matched tracks.</returns>
         public IEnumerable<IModelReference> GetMatchedTracks()
         {
-            return candidates.Keys;
+            return candidates?.Keys ?? Enumerable.Empty<IModelReference>();
         }
 
         /// <summary>
@@ -58,7 +63,7 @@ public IEnumerable<IModelReference> GetMatchedTracks()
         /// <returns>List of matched withs.</returns>
         public IEnumerable<MatchedWith> GetMatchesForTrack(IModelReference trackReference)
         {
-            return candidates.TryGetValue(trackReference, out var matchedWith) ? matchedWith : Enumerable.Empty<MatchedWith>();
+            return (candidates?.TryGetValue(trackReference, out var matchedWith) ?? false) ? matchedWith : Enumerable.Empty<MatchedWith>();
         }
 
         /// <summary>
@@ -68,7 +73,7 @@ public IEnumerable<MatchedWith> GetMatchesForTrack(IModelReference trackReferenc
         /// <param name="match">An instance of <see cref="MatchedWith"/>.</param>
         public void AddNewMatchForTrack(IModelReference trackReference, MatchedWith match)
         {
-            candidates.AddOrUpdate(trackReference, _ => new List<MatchedWith> {match}, (_, old) =>
+            candidates?.AddOrUpdate(trackReference, _ => new List<MatchedWith> {match}, (_, old) =>
             {
                 old.Add(match);
                 return old;