fix list load bug

hotsapi · Sep 7, 2017 · 19365c3 · 19365c3
1 parent a6848ed
commit 19365c3
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 9 deletions.
diff --git a/Hotsapi.Uploader.Common/Manager.cs b/Hotsapi.Uploader.Common/Manager.cs
@@ -66,13 +66,10 @@ private async Task UploadLoop()
             var analyzer = new Analyzer();
             var monitor = new Monitor();
 
-            var replays = _storage.Load().ToList();
-            var filenames = replays.ToDictionary(x => x.Filename);
-            replays.AddRange(monitor.ScanReplays()
-                .Where(x => !filenames.ContainsKey(x))
-                .Select(x => new ReplayFile(x))
-                .Where(x => x.Created != filenames[x.Filename].Created)
-            );
+            var replays = new List<ReplayFile>(_storage.Load());
+            var lookup = new HashSet<ReplayFile>(replays);
+            var comparer = new ReplayFile.ReplayFileComparer();
+            replays.AddRange(monitor.ScanReplays().Select(x => new ReplayFile(x)).Where(x => !lookup.Contains(x, comparer)));
             replays.OrderByDescending(x => x.Created).Map(x => Files.Add(x));
 
             monitor.ReplayAdded += async (_, e) => {

diff --git a/Hotsapi.Uploader.Common/ReplayFile.cs b/Hotsapi.Uploader.Common/ReplayFile.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.ComponentModel;
 using System.IO;
 using System.Linq;
@@ -46,5 +47,18 @@ public override string ToString()
         }
 
         public event PropertyChangedEventHandler PropertyChanged;
+
+        public class ReplayFileComparer : IEqualityComparer<ReplayFile>
+        {
+            public bool Equals(ReplayFile x, ReplayFile y)
+            {
+                return x.Filename == y.Filename && x.Created == y.Created;
+            }
+
+            public int GetHashCode(ReplayFile obj)
+            {
+                return obj.Filename.GetHashCode() ^ obj.Created.GetHashCode();
+            }
+        }
     }
 }
diff --git a/Hotsapi.Uploader.Windows/Properties/AssemblyInfo.cs b/Hotsapi.Uploader.Windows/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.4.0.0")]
-[assembly: AssemblyFileVersion("1.4.0.0")]
+[assembly: AssemblyVersion("1.4.1.0")]
+[assembly: AssemblyFileVersion("1.4.1.0")]