Tweaks to the province outputting code (#2627) #patch

Fixes Rider's complaining about "Captured variable is disposed in outer
scope".
Hopefully also fixes Sentry event 20a029d390f146a4baebe76f504024a7.

Author: IhateTrains

.github/config/changelog-config.json

@@ -8,6 +8,10 @@
             "title": "## 🐛 Fixes",
             "labels": ["fix"]
         },
+        {
+            "title": "## 🧹 Maintenance",
+            "labels": ["maintenance", "chore", "refactor"]
+        },
         {
             "title": "## 🧪 Tests",
             "labels": ["test"]

ImperatorToCK3/Outputter/ProvincesOutputter.cs

@@ -17,15 +17,15 @@ public static async Task OutputProvinces(
 		Title.LandedTitles titles
 	) {
 		Logger.Info("Writing provinces...");
-		
+
 		FrozenSet<ulong> countyCapitalProvinceIds = titles.Counties.AsValueEnumerable()
 			.Select(title => title.CapitalBaronyProvinceId)
 			.Where(id => id is not null)
 			.Select(id => id!.Value)
 			.ToFrozenSet();
 
 		// Output provinces to files named after their de jure kingdoms.
-		var alreadyOutputtedProvinces = new ConcurrentHashSet<ulong>();
+		var alreadyOutputtedProvIds = new ConcurrentHashSet<ulong>();
 
 		var deJureKingdoms = titles.GetDeJureKingdoms();
 		Parallel.ForEach(deJureKingdoms, kingdom => {
@@ -36,60 +36,63 @@ Title.LandedTitles titles
 				}
 
 				ProvinceOutputter.WriteProvince(sb, province, countyCapitalProvinceIds.Contains(province.Id));
-				alreadyOutputtedProvinces.Add(province.Id);
+				alreadyOutputtedProvIds.Add(province.Id);
 			}
 
 			var filePath = $"{outputModPath}/history/provinces/{kingdom.Id}.txt";
 			using var historyOutput = new StreamWriter(filePath);
 			historyOutput.Write(sb.ToString());
 		});
 
-		if (alreadyOutputtedProvinces.Count != provinces.Count) {
+		if (alreadyOutputtedProvIds.Count != provinces.Count) {
 			var filePath = $"{outputModPath}/history/provinces/onlyDeJureDuchy.txt";
 			await using var historyOutput = TextWriter.Synchronized(new StreamWriter(filePath));
 			var deJureDuchies = titles.GetDeJureDuchies();
-			Parallel.ForEach(deJureDuchies, duchy => {
+			foreach (var duchy in deJureDuchies) {
 				var sb = new System.Text.StringBuilder();
 
 				foreach (var province in provinces) {
-					if (alreadyOutputtedProvinces.Contains(province.Id)) {
+					if (alreadyOutputtedProvIds.Contains(province.Id)) {
 						continue;
 					}
 
 					if (duchy.DuchyContainsProvince(province.Id)) {
 						sb.AppendLine($"# {duchy.Id}");
 						ProvinceOutputter.WriteProvince(sb, province, countyCapitalProvinceIds.Contains(province.Id));
-						alreadyOutputtedProvinces.Add(province.Id);
+						alreadyOutputtedProvIds.Add(province.Id);
 					}
 				}
 
 				if (sb.Length > 0) {
-					historyOutput.Write(sb.ToString());
+					await historyOutput.WriteAsync(sb.ToString());
 				}
-			});
+			}
 		}
 
-		// Create province mapping file.
-		if (alreadyOutputtedProvinces.Count != provinces.Count) {
-			var mappingsPath = $"{outputModPath}/history/province_mapping/province_mapping.txt";
-			await using var mappingsWriter = FileHelper.OpenWriteWithRetries(mappingsPath, System.Text.Encoding.UTF8);
-			await using var threadSafeWriter = TextWriter.Synchronized(mappingsWriter);
+		if (alreadyOutputtedProvIds.Count != provinces.Count) {
+			await CreateProvinceMappingFile(outputModPath, provinces, alreadyOutputtedProvIds);
+		}
 
-			foreach (var province in provinces) {
-				if (alreadyOutputtedProvinces.Contains(province.Id)) {
-					continue;
-				}
+		Logger.IncrementProgress();
+	}
 
-				var baseProvId = province.BaseProvinceId;
-				if (baseProvId is null) {
-					continue;
-				}
+	private static async Task CreateProvinceMappingFile(string outputModPath, ProvinceCollection provinces, ConcurrentHashSet<ulong> alreadyOutputtedProvinceIds) {
+		var mappingsPath = $"{outputModPath}/history/province_mapping/province_mapping.txt";
+		await using var mappingsWriter = FileHelper.OpenWriteWithRetries(mappingsPath, System.Text.Encoding.UTF8);
+		await using var threadSafeWriter = TextWriter.Synchronized(mappingsWriter);
 
-				await threadSafeWriter.WriteLineAsync($"{province.Id} = {baseProvId}");
-				alreadyOutputtedProvinces.Add(province.Id);
+		foreach (var province in provinces) {
+			if (alreadyOutputtedProvinceIds.Contains(province.Id)) {
+				continue;
 			}
-		}
 
-		Logger.IncrementProgress();
+			var baseProvId = province.BaseProvinceId;
+			if (baseProvId is null) {
+				continue;
+			}
+
+			await threadSafeWriter.WriteLineAsync($"{province.Id} = {baseProvId}");
+			alreadyOutputtedProvinceIds.Add(province.Id);
+		}
 	}
 }