Add AvoidSkippedMaps

BigBang1112 · Aug 11, 2024 · fbe4c37 · fbe4c37
1 parent 7b26dbd
commit fbe4c37
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 10 deletions.
diff --git a/Src/RandomizerTMF.Logic/RandomizerRules.cs b/Src/RandomizerTMF.Logic/RandomizerRules.cs
@@ -15,6 +15,7 @@ public class RandomizerRules
     };
 
     public Dictionary<ESite, HashSet<uint>> BannedMaps { get; init; } = [];
+    public bool AvoidSkippedMaps { get; set; }
 
     public void Serialize(BinaryWriter writer, int version)
     {
@@ -37,6 +38,13 @@ public void Serialize(BinaryWriter writer, int version)
 				writer.Write(id);
 			}
 		}
+
+        if (version < 2)
+        {
+            return;
+        }
+
+        writer.Write(AvoidSkippedMaps);
     }
 
     public void Deserialize(BinaryReader r, int version)
@@ -63,5 +71,12 @@ public void Deserialize(BinaryReader r, int version)
 			}
 			BannedMaps.Add(site, ids);
 		}
+
+        if (version < 2)
+        {
+            return;
+        }
+
+        AvoidSkippedMaps = r.ReadBoolean();
     }
 }
diff --git a/Src/RandomizerTMF.Logic/Services/MapDownloader.cs b/Src/RandomizerTMF.Logic/Services/MapDownloader.cs
@@ -108,17 +108,25 @@ public async Task<bool> PrepareNewMapAsync(Session currentSession, CancellationT
             return false;
         }
 
-		if (uint.TryParse(trackId, out var trackIdUint)
-			&& config.Rules.BannedMaps.TryGetValue(site, out var bannedTrackIds)
+        if (uint.TryParse(trackId, out var trackIdUint)
+            && config.Rules.BannedMaps.TryGetValue(site, out var bannedTrackIds)
             && bannedTrackIds.Contains(trackIdUint))
-		{
-			logger.LogInformation("Track {trackId} is banned.", trackId);
-			return false;
-		}
+        {
+            logger.LogInformation("Track {trackId} is banned.", trackId);
+            return false;
+        }
 
-		// With the ID, it is possible to immediately download the track Gbx and process it with GBX.NET
+        var tmxLink = requestUri.ToString();
 
-		using var trackGbxResponse = await DownloadMapByTrackIdAsync(requestUri.Host, trackId, cancellationToken);
+        if (config.Rules.AvoidSkippedMaps && currentSession.SkippedMaps.Values.Any(x => x.TmxLink == tmxLink))
+        {
+            logger.LogInformation("Track {trackId} has been played already.", trackId);
+            return false;
+        }
+
+        // With the ID, it is possible to immediately download the track Gbx and process it with GBX.NET
+
+        using var trackGbxResponse = await DownloadMapByTrackIdAsync(requestUri.Host, trackId, cancellationToken);
 
         var map = await GetMapFromResponseAsync(trackGbxResponse, cancellationToken);
 
@@ -136,8 +144,6 @@ public async Task<bool> PrepareNewMapAsync(Session currentSession, CancellationT
 
         var mapSavePath = await SaveMapAsync(trackGbxResponse, map.MapUid, cancellationToken);
 
-        var tmxLink = requestUri.ToString();
-
         currentSession.Map = new SessionMap(map, randomResponse.Headers.Date ?? DateTimeOffset.Now, tmxLink) // The map should be ready to be played now
         {
             FilePath = mapSavePath