Merge pull request #499 from ipax77/dev

maui v2.0.5
ipax77 · Jul 17, 2024 · a75ea6c · a75ea6c
2 parents aeff44b + 2866fdd
commit a75ea6c
Show file tree

Hide file tree

Showing 6 changed files with 55 additions and 22 deletions.
diff --git a/README.md b/README.md
@@ -30,7 +30,17 @@ We really like people helping us with the project. Nevertheless, take your time
 
 ## ChangeLog
 
-<details open="open"><summary>v2.0.4</summary>
+<details open="open"><summary>v2.0.5</summary>
+
+>- s2protocol v5.0.13.92440.0 (s2protocol.NET v0.8.3)
+>- dotnet v8.0.7 (8.0.303)
+>- Maui builds fixed
+>- Maui hanging loading indicator fixed
+>- Combo ratings replay mapping improved (~90% hit rate)
+
+</details>
+
+<details><summary>v2.0.4</summary>
 
 >- Fixed Maui Replay duplicates import loop - thank you @Jurzal for reporting and helping to fix it!
 >- Unit Names and Colors for Replay-Unit-Map

diff --git a/src/dsstats.db8services/Builds/BuildService.Players.cs b/src/dsstats.db8services/Builds/BuildService.Players.cs
@@ -14,24 +14,42 @@ public async Task<BuildResponse> ProducePlayerBuilds(BuildRequest request, Cance
         bool noEnd = end >= DateTime.Today.AddDays(-2);
         var ratingTypes = GetRatingTypes(request);
 
-        var query = from r in context.Replays
-                    from rp in r.ReplayPlayers
-                    from sp in rp.Spawns
-                    from su in sp.Units
-                    join rr in context.ReplayRatings on r.ReplayId equals rr.ReplayId
-                    join rpr in context.ComboReplayPlayerRatings on rp.ReplayPlayerId equals rpr.ReplayPlayerId
-                    where r.GameTime >= start
-                     && (noEnd || r.GameTime < end)
-                     && rp.Race == request.Interest
-                     && (request.Versus == Commander.None || rp.OppRace == request.Versus)
-                     && rr.LeaverType == LeaverType.None
-                     && ratingTypes.Contains(rr.RatingType)
-                     && sp.Breakpoint == request.Breakpoint
-                    select new PlayerUnitGroup()
-                    {
-                        p = rp.Player,
-                        su = su
-                    };
+        var query = IsSqlite ?
+            from r in context.Replays
+            from rp in r.ReplayPlayers
+            from sp in rp.Spawns
+            from su in sp.Units
+            join rr in context.ReplayRatings on r.ReplayId equals rr.ReplayId
+            where r.GameTime >= start
+             && (noEnd || r.GameTime < end)
+             && rp.Race == request.Interest
+             && (request.Versus == Commander.None || rp.OppRace == request.Versus)
+             && rr.LeaverType == LeaverType.None
+             && ratingTypes.Contains(rr.RatingType)
+             && sp.Breakpoint == request.Breakpoint
+            select new PlayerUnitGroup()
+            {
+                p = rp.Player,
+                su = su
+            }
+            : from r in context.Replays
+              from rp in r.ReplayPlayers
+              from sp in rp.Spawns
+              from su in sp.Units
+              join rr in context.ReplayRatings on r.ReplayId equals rr.ReplayId
+              join rpr in context.ComboReplayPlayerRatings on rp.ReplayPlayerId equals rpr.ReplayPlayerId
+              where r.GameTime >= start
+              && (noEnd || r.GameTime < end)
+              && rp.Race == request.Interest
+              && (request.Versus == Commander.None || rp.OppRace == request.Versus)
+              && rr.LeaverType == LeaverType.None
+              && ratingTypes.Contains(rr.RatingType)
+              && sp.Breakpoint == request.Breakpoint
+              select new PlayerUnitGroup()
+              {
+                  p = rp.Player,
+                  su = su
+              };
 
         var predicate = PredicateBuilder.New<PlayerUnitGroup>();
 

diff --git a/src/dsstats.maui/dsstats.maui8/Services/ReplaysService.cs b/src/dsstats.maui/dsstats.maui8/Services/ReplaysService.cs
@@ -75,4 +75,9 @@ public async Task<int> GetReplaysCount(ReplaysRequest request, CancellationToken
     {
         return await remoteReplaysService.GetArcadeReplay(hash, token);
     }
+
+    public Task<ArcadeReplayDto?> GetDssstatsArcadeReplay(string replayHash, CancellationToken token = default)
+    {
+        throw new NotImplementedException();
+    }
 }
diff --git a/src/dsstats.maui/pax.dsstats.parser/pax.dsstats.parser.csproj b/src/dsstats.maui/pax.dsstats.parser/pax.dsstats.parser.csproj
@@ -10,7 +10,7 @@
   <ItemGroup>
     <PackageReference Include="CsvHelper" Version="33.0.1" />
     <PackageReference Include="IronPython.StdLib" Version="2.7.12" />
-    <PackageReference Include="s2protocol.NET" Version="0.8.1" />
+    <PackageReference Include="s2protocol.NET" Version="0.8.2" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/dsstats.ratings/Program.cs b/src/dsstats.ratings/Program.cs
@@ -35,7 +35,7 @@ static void Main(string[] args)
         services.AddLogging(options =>
         {
             options.SetMinimumLevel(LogLevel.Information);
-            options.AddFilter("Microsoft.EntityFrameworkCore", LogLevel.Information);
+            options.AddFilter("Microsoft.EntityFrameworkCore", LogLevel.Warning);
             options.AddConsole();
         });
 

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.4";
+    public const string WasmVersion = "2.0.5";
 }
 
 public class LatestReplayEventArgs : EventArgs