wdg1122/Snap.Hutao
1
0
Fork 0
mirror of https://github.com/wangdage12/Snap.Hutao.git synced 2026-07-31 04:10:25 +08:00
Code Issues Projects Wiki Activity

修正CodeRabbit 审查问题

Browse Source
This commit is contained in:
mfkvfhpdx
2026-05-03 23:07:13 +08:00
parent 726c4203d2
commit 11a5efa488
1 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Snap.Hutao/Snap.Hutao/Service/Cultivation/CultivationService.cs
+20 -7
View File
@@ -110,18 +110,23 @@ internal sealed partial class CultivationService : ICultivationService
public async ValueTask<StatisticsCultivateItemCollection> GetStatisticsCultivateItemCollectionAsync(CultivateProject cultivateProject, ICultivationMetadataContext context, CultivationStatisticsMergeOptions mergeOptions, CancellationToken token) public async ValueTask<StatisticsCultivateItemCollection> GetStatisticsCultivateItemCollectionAsync(CultivateProject cultivateProject, ICultivationMetadataContext context, CultivationStatisticsMergeOptions mergeOptions, CancellationToken token)
{ {
token.ThrowIfCancellationRequested();
await taskContext.SwitchToBackgroundAsync(); await taskContext.SwitchToBackgroundAsync();
return SynchronizedGetStatisticsCultivateItemCollection(cultivateProject, context, mergeOptions); token.ThrowIfCancellationRequested();
return SynchronizedGetStatisticsCultivateItemCollection(cultivateProject, context, mergeOptions, token);
StatisticsCultivateItemCollection SynchronizedGetStatisticsCultivateItemCollection(CultivateProject cultivateProject, ICultivationMetadataContext context, CultivationStatisticsMergeOptions mergeOptions) StatisticsCultivateItemCollection SynchronizedGetStatisticsCultivateItemCollection(CultivateProject cultivateProject, ICultivationMetadataContext context, CultivationStatisticsMergeOptions mergeOptions, CancellationToken token)
{ {
token.ThrowIfCancellationRequested();
Dictionary</* ItemId */ uint, StatisticsCultivateItem> resultItems = []; Dictionary</* ItemId */ uint, StatisticsCultivateItem> resultItems = [];
Guid projectId = cultivateProject.InnerId; Guid projectId = cultivateProject.InnerId;
foreach (ref readonly CultivateEntry entry in cultivationRepository.GetCultivateEntryImmutableArrayByProjectId(projectId).AsSpan()) foreach (ref readonly CultivateEntry entry in cultivationRepository.GetCultivateEntryImmutableArrayByProjectId(projectId).AsSpan())
{ {
token.ThrowIfCancellationRequested();
foreach (ref readonly CultivateItem item in cultivationRepository.GetCultivateItemImmutableArrayByEntryId(entry.InnerId).AsSpan()) foreach (ref readonly CultivateItem item in cultivationRepository.GetCultivateItemImmutableArrayByEntryId(entry.InnerId).AsSpan())
{ {
token.ThrowIfCancellationRequested();
ref StatisticsCultivateItem? existedItem = ref CollectionsMarshal.GetValueRefOrAddDefault(resultItems, item.ItemId, out _); ref StatisticsCultivateItem? existedItem = ref CollectionsMarshal.GetValueRefOrAddDefault(resultItems, item.ItemId, out _);
if (existedItem is null || existedItem.ExcludedFromPresentation) if (existedItem is null || existedItem.ExcludedFromPresentation)
{ {
@@ -132,12 +137,13 @@ internal sealed partial class CultivationService : ICultivationService
existedItem.Count += item.Count; existedItem.Count += item.Count;
} }
RecursiveAddMaterialIngredientsByMaterialId(cultivateProject, context, resultItems, item.ItemId); RecursiveAddMaterialIngredientsByMaterialId(cultivateProject, context, resultItems, item.ItemId, token);
} }
} }
foreach (ref readonly InventoryItem inventoryItem in inventoryRepository.GetInventoryItemImmutableArrayByProjectId(projectId).AsSpan()) foreach (ref readonly InventoryItem inventoryItem in inventoryRepository.GetInventoryItemImmutableArrayByProjectId(projectId).AsSpan())
{ {
token.ThrowIfCancellationRequested();
ref StatisticsCultivateItem existedItem = ref CollectionsMarshal.GetValueRefOrNullRef(resultItems, inventoryItem.ItemId); ref StatisticsCultivateItem existedItem = ref CollectionsMarshal.GetValueRefOrNullRef(resultItems, inventoryItem.ItemId);
if (!Unsafe.IsNullRef(in existedItem)) if (!Unsafe.IsNullRef(in existedItem))
{ {
@@ -146,7 +152,7 @@ internal sealed partial class CultivationService : ICultivationService
} }
CultivationStatisticsSurplusMerge.Apply(resultItems, context, mergeOptions); CultivationStatisticsSurplusMerge.Apply(resultItems, context, mergeOptions);
ApplyStatisticsConsumerMenuLines(resultItems, projectId, context, cultivationRepository); ApplyStatisticsConsumerMenuLines(resultItems, projectId, context, cultivationRepository, token);
return new(resultItems); return new(resultItems);
} }
@@ -314,8 +320,10 @@ internal sealed partial class CultivationService : ICultivationService
return true; return true;
} }
private static void RecursiveAddMaterialIngredientsByMaterialId(CultivateProject cultivateProject, ICultivationMetadataContext context, Dictionary<uint, StatisticsCultivateItem> resultItems, MaterialId materialId) private static void RecursiveAddMaterialIngredientsByMaterialId(CultivateProject cultivateProject, ICultivationMetadataContext context, Dictionary<uint, StatisticsCultivateItem> resultItems, MaterialId materialId, CancellationToken token)
{ {
token.ThrowIfCancellationRequested();
if (materialId == 104003U) if (materialId == 104003U)
{ {
foreach (ref readonly MaterialId xpBookId in (ReadOnlySpan<MaterialId>)[104001U, 104002U]) foreach (ref readonly MaterialId xpBookId in (ReadOnlySpan<MaterialId>)[104001U, 104002U])
@@ -331,9 +339,10 @@ internal sealed partial class CultivationService : ICultivationService
{ {
foreach (ref readonly IdCount ingredient in combine.Materials.AsSpan()) foreach (ref readonly IdCount ingredient in combine.Materials.AsSpan())
{ {
token.ThrowIfCancellationRequested();
ref StatisticsCultivateItem? ingredientItem = ref CollectionsMarshal.GetValueRefOrAddDefault(resultItems, ingredient.Id, out _); ref StatisticsCultivateItem? ingredientItem = ref CollectionsMarshal.GetValueRefOrAddDefault(resultItems, ingredient.Id, out _);
ingredientItem ??= StatisticsCultivateItem.Create(context.GetMaterial(ingredient.Id), cultivateProject.ServerTimeZoneOffset); ingredientItem ??= StatisticsCultivateItem.Create(context.GetMaterial(ingredient.Id), cultivateProject.ServerTimeZoneOffset);
RecursiveAddMaterialIngredientsByMaterialId(cultivateProject, context, resultItems, ingredient.Id); RecursiveAddMaterialIngredientsByMaterialId(cultivateProject, context, resultItems, ingredient.Id, token);
} }
} }
} }
@@ -342,8 +351,10 @@ internal sealed partial class CultivationService : ICultivationService
Dictionary<uint, StatisticsCultivateItem> resultItems, Dictionary<uint, StatisticsCultivateItem> resultItems,
Guid projectId, Guid projectId,
ICultivationMetadataContext context, ICultivationMetadataContext context,
ICultivationRepository cultivationRepository) ICultivationRepository cultivationRepository,
CancellationToken token)
{ {
token.ThrowIfCancellationRequested();
ImmutableArray<(CultivateEntry Entry, CultivateItem Item)> pairs = cultivationRepository.GetCultivateEntryItemPairsByProjectId(projectId); ImmutableArray<(CultivateEntry Entry, CultivateItem Item)> pairs = cultivationRepository.GetCultivateEntryItemPairsByProjectId(projectId);
ImmutableArray<CultivateEntry> projectEntries = cultivationRepository.GetCultivateEntryImmutableArrayByProjectId(projectId); ImmutableArray<CultivateEntry> projectEntries = cultivationRepository.GetCultivateEntryImmutableArrayByProjectId(projectId);
Dictionary<Guid, CultivateEntry> entryByInnerId = new(projectEntries.Length); Dictionary<Guid, CultivateEntry> entryByInnerId = new(projectEntries.Length);
@@ -356,6 +367,7 @@ internal sealed partial class CultivationService : ICultivationService
foreach ((CultivateEntry entry, CultivateItem item) in pairs.AsSpan()) foreach ((CultivateEntry entry, CultivateItem item) in pairs.AsSpan())
{ {
token.ThrowIfCancellationRequested();
if (item.IsFinished) if (item.IsFinished)
{ {
continue; continue;
@@ -370,6 +382,7 @@ internal sealed partial class CultivationService : ICultivationService
foreach ((uint materialId, StatisticsCultivateItem stat) in resultItems) foreach ((uint materialId, StatisticsCultivateItem stat) in resultItems)
{ {
token.ThrowIfCancellationRequested();
if (MaterialIds.IsExcludedFromStatisticsConsumerMenu(materialId)) if (MaterialIds.IsExcludedFromStatisticsConsumerMenu(materialId))
{ {
stat.StatisticsConsumerMenuLines = ImmutableArray.Create(StatisticsConsumerMenuLine.Plain(SH.ViewPageCultivationStatisticsConsumerMenuExcluded)); stat.StatisticsConsumerMenuLines = ImmutableArray.Create(StatisticsConsumerMenuLine.Plain(SH.ViewPageCultivationStatisticsConsumerMenuExcluded));