Merge pull request #532 from ipax77/dev

v2.0.8

Author: ipax77

README.md

@@ -30,6 +30,14 @@ We really like people helping us with the project. Nevertheless, take your time
 
 ## ChangeLog
 
+<details open="open"><summary>v2.0.8</summary>
+
+>- dotnet update to 8.0.15
+>- Maui Replay Import improved
+>- Maui Import 'Robust Import' - saving replays one by one
+
+</details>
+
 <details open="open"><summary>v2.0.7</summary>
 
 >- s2protocol 5.0.14.93333.0 (s2protocol.NET v0.8.4)

src/dsstats.db8services/IReplayRepository.cs

@@ -5,9 +5,7 @@ namespace dsstats.db8services;
 
 public interface IReplayRepository
 {
-    Task SaveReplay(ReplayDto replayDto,
-                    HashSet<Unit> units,
-                    HashSet<Upgrade> upgrades);
+    Task SaveReplay(ReplayDto replayDto);
     Task<ReplayDto?> GetLatestReplay();
     Task<ReplayDto?> GetPreviousReplay(DateTime gameTime);
     Task<ReplayDto?> GetNextReplay(DateTime gameTime);

src/dsstats.db8services/Import/ImportService.cs

@@ -38,6 +38,7 @@ public async Task Init()
         await initSs.WaitAsync();
         if (IsInit)
         {
+            initSs.Release();
             return;
         }
         try
@@ -181,7 +182,7 @@ private async Task<int> GetUnitIdAsync(string name)
         }
     }
 
-    private int GetUnitId(string name)
+    public int GetUnitId(string name)
     {
         if (!Units.TryGetValue(name, out var unitId))
         {
@@ -236,7 +237,7 @@ private async Task<int> GetUpgradeIdAsync(string name)
         }
     }
 
-    private int GetUpgradeId(string name)
+    public int GetUpgradeId(string name)
     {
         if (!Upgrades.TryGetValue(name, out var upgradeId))
         {

src/dsstats.db8services/ReplayRepository.cs

@@ -4,10 +4,10 @@
 using dsstats.db8;
 using dsstats.shared;
 using dsstats.shared.Extensions;
+using dsstats.shared.Interfaces;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
-using System;
 using System.Diagnostics;
 
 namespace dsstats.db8services;
@@ -18,20 +18,24 @@ public class ReplayRepository : IReplayRepository
     private readonly ReplayContext context;
     private readonly IOptions<DbImportOptions> dbImportOptions;
     private readonly IMapper mapper;
+    private readonly IImportService importService;
 
     public ReplayRepository(ILogger<ReplayRepository> logger,
                         ReplayContext context,
                         IOptions<DbImportOptions> dbImportOptions,
-                        IMapper mapper)
+                        IMapper mapper,
+                        IImportService importService)
     {
         this.logger = logger;
         this.context = context;
         this.dbImportOptions = dbImportOptions;
         this.mapper = mapper;
+        this.importService = importService;
     }
 
-    public async Task SaveReplay(ReplayDto replayDto, HashSet<Unit> units, HashSet<Upgrade> upgrades)
+    public async Task SaveReplay(ReplayDto replayDto)
     {
+        await importService.Init();
         replayDto.SetDefaultFilter();
 
         var dbReplay = mapper.Map<Replay>(replayDto);
@@ -80,10 +84,10 @@ public async Task SaveReplay(ReplayDto replayDto, HashSet<Unit> units, HashSet<U
 
             foreach (var spawn in replayPlayer.Spawns)
             {
-                spawn.Units = await GetMapedSpawnUnits(spawn, replayPlayer.Race, units);
+                spawn.Units = GetMapedSpawnUnits(spawn, replayPlayer.Race);
             }
 
-            replayPlayer.Upgrades = await GetMapedPlayerUpgrades(replayPlayer, upgrades);
+            replayPlayer.Upgrades = GetMapedPlayerUpgrades(replayPlayer);
 
         }
 
@@ -106,55 +110,31 @@ public async Task SaveReplay(ReplayDto replayDto, HashSet<Unit> units, HashSet<U
         }
     }
 
-    private async Task<ICollection<SpawnUnit>> GetMapedSpawnUnits(Spawn spawn, Commander commander, HashSet<Unit> units)
+    private ICollection<SpawnUnit> GetMapedSpawnUnits(Spawn spawn, Commander commander)
     {
         List<SpawnUnit> spawnUnits = new();
         foreach (var spawnUnit in spawn.Units)
         {
-            var listUnit = units.FirstOrDefault(f => f.Name.Equals(spawnUnit.Unit.Name));
-            if (listUnit == null)
-            {
-                listUnit = new()
-                {
-                    Name = spawnUnit.Unit.Name
-                };
-                context.Units.Add(listUnit);
-                await context.SaveChangesAsync();
-                units.Add(listUnit);
-            }
-
             spawnUnits.Add(new()
             {
                 Count = spawnUnit.Count,
                 Poss = spawnUnit.Poss,
-                UnitId = listUnit.UnitId,
+                UnitId = importService.GetUnitId(spawnUnit.Unit.Name),
                 SpawnId = spawn.SpawnId
             });
         }
         return spawnUnits;
     }
 
-    private async Task<ICollection<PlayerUpgrade>> GetMapedPlayerUpgrades(ReplayPlayer player, HashSet<Upgrade> upgrades)
+    private ICollection<PlayerUpgrade> GetMapedPlayerUpgrades(ReplayPlayer player)
     {
         List<PlayerUpgrade> playerUpgrades = new();
         foreach (var playerUpgrade in player.Upgrades)
         {
-            var listUpgrade = upgrades.FirstOrDefault(f => f.Name.Equals(playerUpgrade.Upgrade.Name));
-            if (listUpgrade == null)
-            {
-                listUpgrade = new()
-                {
-                    Name = playerUpgrade.Upgrade.Name
-                };
-                context.Upgrades.Add(listUpgrade);
-                await context.SaveChangesAsync();
-                upgrades.Add(listUpgrade);
-            }
-
             playerUpgrades.Add(new()
             {
                 Gameloop = playerUpgrade.Gameloop,
-                UpgradeId = listUpgrade.UpgradeId,
+                UpgradeId = importService.GetUpgradeId(playerUpgrade.Upgrade.Name),
                 ReplayPlayerId = player.ReplayPlayerId
             });
         }

src/dsstats.maui/dsstats.localization/DsstatsLoc.de.resx

@@ -403,4 +403,7 @@
   <data name="Please check if the settings are as expected." xml:space="preserve">
     <value>Bitte überprüfen Sie, ob die Einstellungen wie erwartet sind.</value>
   </data>
+  <data name="NoBatchImport" xml:space="preserve">
+    <value>Konservativer Wiederholungsimport (etwas langsamer, aber robuster)</value>
+  </data>
 </root>

src/dsstats.maui/dsstats.localization/DsstatsLoc.en.resx

@@ -403,4 +403,7 @@
   <data name="Please check if the settings are as expected." xml:space="preserve">
     <value>Please check if the settings are as expected.</value>
   </data>
+  <data name="NoBatchImport" xml:space="preserve">
+    <value>Conservative Replay Import (slightly slower, but more robust)</value>
+  </data>
 </root>

src/dsstats.maui/dsstats.localization/DsstatsLoc.es.resx

@@ -403,4 +403,7 @@
   <data name="Please check if the settings are as expected." xml:space="preserve">
     <value>Por favor, compruebe si la configuración es la esperada.</value>
   </data>
+  <data name="NoBatchImport" xml:space="preserve">
+    <value>Importación de repeticiones conservadora (ligeramente más lenta, pero más robusta)</value>
+  </data>
 </root>

src/dsstats.maui/dsstats.localization/DsstatsLoc.fr.resx

@@ -403,4 +403,7 @@
   <data name="Please check if the settings are as expected." xml:space="preserve">
     <value>Veuillez vérifier si les paramètres sont conformes aux attentes.</value>
   </data>
+  <data name="NoBatchImport" xml:space="preserve">
+    <value>Importation de rediffusions conservatrice (légèrement plus lente, mais plus robuste)</value>
+  </data>
 </root>

src/dsstats.maui/dsstats.localization/DsstatsLoc.resx

@@ -403,4 +403,7 @@
   <data name="Please check if the settings are as expected." xml:space="preserve">
     <value>Please check if the settings are as expected.</value>
   </data>
+  <data name="NoBatchImport" xml:space="preserve">
+    <value>Conservative Replay Import (slightly slower, but more robust)</value>
+  </data>
 </root>

src/dsstats.maui/dsstats.localization/DsstatsLoc.ru.resx

@@ -403,4 +403,7 @@
   <data name="Please check if the settings are as expected." xml:space="preserve">
     <value>Пожалуйста, проверьте, соответствуют ли настройки ожидаемым.</value>
   </data>
+  <data name="NoBatchImport" xml:space="preserve">
+    <value>Консервативный импорт повторов (немного медленнее, но более надежный)</value>
+  </data>
 </root>