add duplicate replays report for maui

ipax77 · ipax77 · commit 252b34509a15 · 2025-07-27T06:22:12.000+02:00
diff --git a/src/dsstats.db8services/Import/ImportService.Duplicates.cs b/src/dsstats.db8services/Import/ImportService.Duplicates.cs
@@ -6,7 +6,7 @@ namespace dsstats.db8services.Import;
 
 public partial class ImportService
 {
-    private async Task<int> HandleDuplicates(List<Replay> replays, ReplayContext context)
+    private async Task<DupReport> HandleDuplicates(List<Replay> replays, ReplayContext context)
     {
         var replayHashes = replays.Select(s => s.ReplayHash).ToList();
         var dupReplays = await context.Replays
@@ -37,10 +37,29 @@ from rp in r.ReplayPlayers
 
             dupReplays.AddRange(lsDupReplays);
         }
+        else
+        {
+            var dupHashes = dupReplays
+                .Select(s => s.ReplayHash)
+                .ToHashSet();
+            foreach (var replay in replays.ToArray())
+            {
+                if (dupHashes.Contains(replay.ReplayHash))
+                {
+                    replays.Remove(replay);
+                }
+            }
+
+            return new()
+            {
+                Duplicates = dupReplays.Count,
+                ReplayPaths = dupReplays.Select(s => s.FileName).ToHashSet()
+            };
+        }
 
         if (dupReplays.Count == 0)
         {
-            return 0;
+            return new();
         }
 
         int dupsHandled = 0;
@@ -74,7 +93,7 @@ from rp in r.ReplayPlayers
             }
         }
         await context.SaveChangesAsync();
-        return dupsHandled;
+        return new() { Duplicates = dupsHandled };
     }
 
     private async Task<bool> HandleDuplicate(Replay dbReplay, Replay importReplay, ReplayContext context)
@@ -148,3 +167,9 @@ private async Task DeleteReplay(string replayHash, ReplayContext context)
         }
     }
 }
+
+internal record DupReport
+{
+    public int Duplicates { get; init; }
+    public HashSet<string> ReplayPaths { get; init; } = [];
+}
diff --git a/src/dsstats.db8services/Import/ImportService.Import.cs b/src/dsstats.db8services/Import/ImportService.Import.cs
@@ -102,11 +102,13 @@ public async Task<ImportResult> Import(List<ReplayDto> replayDtos, List<PlayerId
 
         string? error = null;
         int dups = 0;
+        HashSet<string> duplicates = [];
         await importSs.WaitAsync();
         try
         {
-            dups = await HandleDuplicates(replays, context);
-
+            var dupResult = await HandleDuplicates(replays, context);
+            dups = dupResult.Duplicates;
+            duplicates = dupResult.ReplayPaths;
             if (replays.Count > 0)
             {
                 DateTime import = DateTime.UtcNow;
@@ -132,7 +134,10 @@ public async Task<ImportResult> Import(List<ReplayDto> replayDtos, List<PlayerId
         {
             Imported = replays.Count,
             Duplicates = dups,
-            Error = error
+            Error = error,
+            DetailErrors = duplicates
+                .Select(s => new KeyValuePair<string, string>(s, "Duplicate replay found."))
+                .ToDictionary(kvp => kvp.Key, kvp => kvp.Value)
         };
     }
 }
diff --git a/src/dsstats.db8services/ReplayRepository.cs b/src/dsstats.db8services/ReplayRepository.cs
@@ -73,15 +73,7 @@ public async Task SaveReplay(ReplayDto replayDto)
         dbReplay.Imported = DateTime.UtcNow;
         context.Replays.Add(dbReplay);
 
-        try
-        {
-            await context.SaveChangesAsync();
-        }
-        catch (Exception ex)
-        {
-            logger.LogError("failed saving replay: {error}", ex.Message);
-            throw;
-        }
+        await context.SaveChangesAsync();
     }
 
     private ICollection<SpawnUnit> GetMapedSpawnUnits(Spawn spawn, Commander commander)
diff --git a/src/dsstats.maui/dsstats.maui8/Platforms/Windows/Package.appxmanifest b/src/dsstats.maui/dsstats.maui8/Platforms/Windows/Package.appxmanifest
@@ -5,7 +5,7 @@
   xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
   IgnorableNamespaces="uap rescap">
 
-<Identity Name="29898PhilippHetzner.141231D0ED353" Publisher="CN=592AF738-4E2A-4BF3-87A7-D07953D08DE9" Version="2.0.10.0" />
+<Identity Name="29898PhilippHetzner.141231D0ED353" Publisher="CN=592AF738-4E2A-4BF3-87A7-D07953D08DE9" Version="2.1.0.0" />
 	
   <Properties>
     <DisplayName>$placeholder$</DisplayName>
diff --git a/src/dsstats.maui/dsstats.maui8/Services/DsstatsService.DecodeJob.cs b/src/dsstats.maui/dsstats.maui8/Services/DsstatsService.DecodeJob.cs
@@ -4,7 +4,6 @@
 using pax.dsstats.parser;
 using s2protocol.NET;
 using System.Collections.Concurrent;
-using System.Reflection;
 using System.Security.Cryptography;
 
 namespace dsstats.maui8.Services;
@@ -177,6 +176,18 @@ private async Task ImportReplays(bool flush = false)
                         {
                             errorReplays.AddRange(replaysToSave);
                         }
+
+                        foreach (var detailError in result.DetailErrors)
+                        {
+                            OnDecodeStateChanged(new()
+                            {
+                                DecodeError = new()
+                                {
+                                    ReplayPath = detailError.Key,
+                                    Error = detailError.Value
+                                }
+                            });
+                        }
                     }
                 }
             }
@@ -257,8 +268,7 @@ private ReplayDecoder GetDecoder()
     {
         if (decoder == null)
         {
-            var _assemblyPath = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) ?? "";
-            decoder = new ReplayDecoder(_assemblyPath);
+            decoder = new ReplayDecoder();
         }
         return decoder;
     }
diff --git a/src/dsstats.maui/dsstats.maui8/Services/GitHubUpdateService.cs b/src/dsstats.maui/dsstats.maui8/Services/GitHubUpdateService.cs
@@ -6,7 +6,7 @@ namespace dsstats.maui8.Services;
 public class GitHubUpdateService(ILogger<GitHubUpdateService> logger) : IUpdateService
 {
     private static readonly string packageUri = "https://github.com/ipax77/dsstats/releases/latest/download/";
-    public static readonly Version CurrentVersion = new Version(2, 0, 10, 0);
+    public static readonly Version CurrentVersion = new Version(2, 1, 0, 0);
     private Version latestVersion = new Version(0, 0, 0, 0);
     private readonly object lockobject = new();
     private readonly bool logToFile = false;
diff --git a/src/dsstats.maui/dsstats.maui8/dsstats.maui8.csproj b/src/dsstats.maui/dsstats.maui8/dsstats.maui8.csproj
@@ -73,7 +73,6 @@
         <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.100" />
         <PackageReference Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="8.0.100" />
         <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.1" />
-		<PackageReference Include="IronPython.StdLib" Version="2.7.12" />
 		<PackageReference Include="Blazored.Toast" Version="4.2.1" />
         <PackageReference Include="CommunityToolkit.Maui" Version="9.1.1" />
         <PackageReference Include="System.Data.SqlClient" Version="4.9.0" />
diff --git a/src/dsstats.maui/pax.dsstats.parser/Parse.cs b/src/dsstats.maui/pax.dsstats.parser/Parse.cs
@@ -106,7 +106,7 @@ public static async Task<Sc2Replay> GetSc2Replay(string replayPath, string? asse
             throw new ArgumentNullException(nameof(assemblyPath));
         }
 
-        ReplayDecoder decoder = new(assemblyPath);
+        ReplayDecoder decoder = new();
 
         ReplayDecoderOptions options = new ReplayDecoderOptions()
         {
diff --git a/src/dsstats.maui/pax.dsstats.parser/pax.dsstats.parser.csproj b/src/dsstats.maui/pax.dsstats.parser/pax.dsstats.parser.csproj
@@ -9,9 +9,8 @@
 
   <ItemGroup>
     <PackageReference Include="CsvHelper" Version="33.1.0" />
-    <PackageReference Include="IronPython.StdLib" Version="2.7.12" />
-    <PackageReference Include="s2protocol.NET" Version="0.8.4" />
     <PackageReference Include="System.Drawing.Common" Version="8.0.17" />
+	<PackageReference Include="s2protocol.NET" Version="0.9.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/dsstats.shared/Data.cs b/src/dsstats.shared/Data.cs
@@ -1333,7 +1333,7 @@ public static (GameMode gameMode, int totalBans, int totalPicks) GetPickBanModeS
 
     public const string ReplayBlobDir = "/data/ds/replayblobs";
     public const string MysqlFilesDir = "/data/mysqlfiles";
-    public const string WasmVersion = "2.0.9";
+    public const string WasmVersion = "2.1.0";
 }
 
 public class LatestReplayEventArgs : EventArgs
diff --git a/src/dsstats.shared/ImportResult.cs b/src/dsstats.shared/ImportResult.cs
@@ -5,4 +5,5 @@ public record ImportResult
     public int Imported { get; init; }
     public int Duplicates { get; init; }
     public string? Error { get; init; }
+    public Dictionary<string, string> DetailErrors = [];
 }

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ namespace dsstats.db8services.Import;`
`6`	`6`
`7`	`7`	`public partial class ImportService`
`8`	`8`	`{`
`9`		`- private async Task<int> HandleDuplicates(List<Replay> replays, ReplayContext context)`
	`9`	`+ private async Task<DupReport> HandleDuplicates(List<Replay> replays, ReplayContext context)`
`10`	`10`	`{`
`11`	`11`	`var replayHashes = replays.Select(s => s.ReplayHash).ToList();`
`12`	`12`	`var dupReplays = await context.Replays`
`@@ -37,10 +37,29 @@ from rp in r.ReplayPlayers`
`37`	`37`
`38`	`38`	`dupReplays.AddRange(lsDupReplays);`
`39`	`39`	`}`
	`40`	`+ else`
	`41`	`+ {`
	`42`	`+ var dupHashes = dupReplays`
	`43`	`+ .Select(s => s.ReplayHash)`
	`44`	`+ .ToHashSet();`
	`45`	`+ foreach (var replay in replays.ToArray())`
	`46`	`+ {`
	`47`	`+ if (dupHashes.Contains(replay.ReplayHash))`
	`48`	`+ {`
	`49`	`+ replays.Remove(replay);`
	`50`	`+ }`
	`51`	`+ }`
	`52`	`+`
	`53`	`+ return new()`
	`54`	`+ {`
	`55`	`+ Duplicates = dupReplays.Count,`
	`56`	`+ ReplayPaths = dupReplays.Select(s => s.FileName).ToHashSet()`
	`57`	`+ };`
	`58`	`+ }`
`40`	`59`
`41`	`60`	`if (dupReplays.Count == 0)`
`42`	`61`	`{`
`43`		`- return 0;`
	`62`	`+ return new();`
`44`	`63`	`}`
`45`	`64`
`46`	`65`	`int dupsHandled = 0;`
`@@ -74,7 +93,7 @@ from rp in r.ReplayPlayers`
`74`	`93`	`}`
`75`	`94`	`}`
`76`	`95`	`await context.SaveChangesAsync();`
`77`		`- return dupsHandled;`
	`96`	`+ return new() { Duplicates = dupsHandled };`
`78`	`97`	`}`
`79`	`98`
`80`	`99`	`private async Task<bool> HandleDuplicate(Replay dbReplay, Replay importReplay, ReplayContext context)`
`@@ -148,3 +167,9 @@ private async Task DeleteReplay(string replayHash, ReplayContext context)`
`148`	`167`	`}`
`149`	`168`	`}`
`150`	`169`	`}`
	`170`	`+`
	`171`	`+internal record DupReport`
	`172`	`+{`
	`173`	`+ public int Duplicates { get; init; }`
	`174`	`+ public HashSet<string> ReplayPaths { get; init; } = [];`
	`175`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -102,11 +102,13 @@ public async Task<ImportResult> Import(List<ReplayDto> replayDtos, List<PlayerId`
`102`	`102`
`103`	`103`	`string? error = null;`
`104`	`104`	`int dups = 0;`
	`105`	`+ HashSet<string> duplicates = [];`
`105`	`106`	`await importSs.WaitAsync();`
`106`	`107`	`try`
`107`	`108`	`{`
`108`		`- dups = await HandleDuplicates(replays, context);`
`109`		`-`
	`109`	`+ var dupResult = await HandleDuplicates(replays, context);`
	`110`	`+ dups = dupResult.Duplicates;`
	`111`	`+ duplicates = dupResult.ReplayPaths;`
`110`	`112`	`if (replays.Count > 0)`
`111`	`113`	`{`
`112`	`114`	`DateTime import = DateTime.UtcNow;`
`@@ -132,7 +134,10 @@ public async Task<ImportResult> Import(List<ReplayDto> replayDtos, List<PlayerId`
`132`	`134`	`{`
`133`	`135`	`Imported = replays.Count,`
`134`	`136`	`Duplicates = dups,`
`135`		`- Error = error`
	`137`	`+ Error = error,`
	`138`	`+ DetailErrors = duplicates`
	`139`	`+ .Select(s => new KeyValuePair<string, string>(s, "Duplicate replay found."))`
	`140`	`+ .ToDictionary(kvp => kvp.Key, kvp => kvp.Value)`
`136`	`141`	`};`
`137`	`142`	`}`
`138`	`143`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@`
`4`	`4`	`using pax.dsstats.parser;`
`5`	`5`	`using s2protocol.NET;`
`6`	`6`	`using System.Collections.Concurrent;`
`7`		`-using System.Reflection;`
`8`	`7`	`using System.Security.Cryptography;`
`9`	`8`
`10`	`9`	`namespace dsstats.maui8.Services;`
`@@ -177,6 +176,18 @@ private async Task ImportReplays(bool flush = false)`
`177`	`176`	`{`
`178`	`177`	`errorReplays.AddRange(replaysToSave);`
`179`	`178`	`}`
	`179`	`+`
	`180`	`+ foreach (var detailError in result.DetailErrors)`
	`181`	`+ {`
	`182`	`+ OnDecodeStateChanged(new()`
	`183`	`+ {`
	`184`	`+ DecodeError = new()`
	`185`	`+ {`
	`186`	`+ ReplayPath = detailError.Key,`
	`187`	`+ Error = detailError.Value`
	`188`	`+ }`
	`189`	`+ });`
	`190`	`+ }`
`180`	`191`	`}`
`181`	`192`	`}`
`182`	`193`	`}`
`@@ -257,8 +268,7 @@ private ReplayDecoder GetDecoder()`
`257`	`268`	`{`
`258`	`269`	`if (decoder == null)`
`259`	`270`	`{`
`260`		`- var _assemblyPath = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) ?? "";`
`261`		`- decoder = new ReplayDecoder(_assemblyPath);`
	`271`	`+ decoder = new ReplayDecoder();`
`262`	`272`	`}`
`263`	`273`	`return decoder;`
`264`	`274`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ namespace dsstats.maui8.Services;`
`6`	`6`	`public class GitHubUpdateService(ILogger<GitHubUpdateService> logger) : IUpdateService`
`7`	`7`	`{`
`8`	`8`	`private static readonly string packageUri = "https://github.com/ipax77/dsstats/releases/latest/download/";`
`9`		`- public static readonly Version CurrentVersion = new Version(2, 0, 10, 0);`
	`9`	`+ public static readonly Version CurrentVersion = new Version(2, 1, 0, 0);`
`10`	`10`	`private Version latestVersion = new Version(0, 0, 0, 0);`
`11`	`11`	`private readonly object lockobject = new();`
`12`	`12`	`private readonly bool logToFile = false;`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ public static async Task<Sc2Replay> GetSc2Replay(string replayPath, string? asse`
`106`	`106`	`throw new ArgumentNullException(nameof(assemblyPath));`
`107`	`107`	`}`
`108`	`108`
`109`		`- ReplayDecoder decoder = new(assemblyPath);`
	`109`	`+ ReplayDecoder decoder = new();`
`110`	`110`
`111`	`111`	`ReplayDecoderOptions options = new ReplayDecoderOptions()`
`112`	`112`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1333,7 +1333,7 @@ public static (GameMode gameMode, int totalBans, int totalPicks) GetPickBanModeS`
`1333`	`1333`
`1334`	`1334`	`public const string ReplayBlobDir = "/data/ds/replayblobs";`
`1335`	`1335`	`public const string MysqlFilesDir = "/data/mysqlfiles";`
`1336`		`- public const string WasmVersion = "2.0.9";`
	`1336`	`+ public const string WasmVersion = "2.1.0";`
`1337`	`1337`	`}`
`1338`	`1338`
`1339`	`1339`	`public class LatestReplayEventArgs : EventArgs`