fix duplicate check logic

Author: Martijn Hoekstra

Hotsapi.Uploader.Common/Uploader.cs

@@ -1,11 +1,11 @@
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using NLog;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net;
-using System.Net.Http;
+using System.Net.Http;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
@@ -34,12 +34,12 @@ public Uploader()
         /// <summary>
         /// Upload replay
         /// </summary>
-        /// <param name="file"></param>
+        /// <param name="file">The file to upload</param>
         public async Task Upload(ReplayFile file)
         {
-            var checkDuplicate = file.UploadStatus != UploadStatus.ReadyForUpload;
+            var doDuplicateCheck = file.UploadStatus != UploadStatus.ReadyForUpload;
             file.UploadStatus = UploadStatus.Uploading;
-            if (file.Fingerprint != null && !checkDuplicate || await CheckDuplicate(file.Fingerprint)) {
+            if (file.Fingerprint != null && doDuplicateCheck && await CheckDuplicate(file.Fingerprint)) {
                 _log.Debug($"File {file} marked as duplicate");
                 file.UploadStatus = UploadStatus.Duplicate;
             } else {
@@ -134,12 +134,12 @@ private async Task<string[]> CheckDuplicate(IEnumerable<string> fingerprints)
         /// </summary>
         public async Task CheckDuplicate(IEnumerable<ReplayFile> replays)
         {
-            foreach(var replay in replays) {
-                replay.UploadStatus = UploadStatus.CheckingDuplicates;
+            foreach(var replay in replays) {
+                replay.UploadStatus = UploadStatus.CheckingDuplicates;
             }
             var exists = new HashSet<string>(await CheckDuplicate(replays.Select(x => x.Fingerprint)));
-            foreach(var replay in replays) {
-                replay.UploadStatus = exists.Contains(replay.Fingerprint) ? UploadStatus.Duplicate : UploadStatus.ReadyForUpload;
+            foreach(var replay in replays) {
+                replay.UploadStatus = exists.Contains(replay.Fingerprint) ? UploadStatus.Duplicate : UploadStatus.ReadyForUpload;
             }
         }