xtaodada/StarRailCopilot
1
0
Fork 0
mirror of https://github.com/LmeSzinc/StarRailCopilot.git synced 2024-11-25 01:49:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Drop planner rows with a total of 0

Browse Source
This commit is contained in:
LmeSzinc 2024-06-15 01:04:08 +08:00
parent ecc633df89
commit 0e8ad0db74
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tasks/planner/model.py
View File

@ -99,6 +99,10 @@ SET_ROW_EXCLUDE = {
}
class InvalidPlannerRow(Exception):
pass
class StoredPlannerProxy(BaseModelWithFallback):
item: ITEM_TYPES
value: int | MultiValue = 0
@ -125,11 +129,12 @@ class StoredPlannerProxy(BaseModelWithFallback):
logger.warning(f'Planner item {self.item} has_group_base '
f'but given total={self.total} is not a MultiValue')
self.total = MultiValue()
raise Exception
if not isinstance(self.synthesize, MultiValue):
logger.warning(f'Planner item {self.item} has_group_base '
f'but given synthesize={self.synthesize} is not a MultiValue')
self.synthesize = MultiValue()
if self.total.equivalent_green() <= 0:
raise InvalidPlannerRow(f'Planner item {self.item} has invalid total={self.total}, drop')
else:
if not isinstance(self.value, int):
logger.warning(f'Planner item {self.item} has no group base '
@ -143,6 +148,12 @@ class StoredPlannerProxy(BaseModelWithFallback):
logger.warning(f'Planner item {self.item} has no group base '
f'but given synthesize={self.synthesize} is not an int')
self.synthesize = 0
if self.total <= 0:
raise InvalidPlannerRow(f'Planner item {self.item} has invalid total={self.total}, drop')
if self.synthesize != 0:
logger.warning(f'Planner item {self.item} has no group base '
f'its synthesize={self.synthesize} should be 0')
self.synthesize = 0
return self
def clear(self):
@ -401,7 +412,7 @@ class StoredPlannerProxy(BaseModelWithFallback):
if self.item.has_group_base:
return self.synthesize.green > 0 or self.synthesize.blue > 0 or self.synthesize.purple > 0
else:
return self.synthesize > 0
return False
def load_planner_result(self, row: PlannerResultRow):
"""
@ -475,7 +486,7 @@ class PlannerProgressParser:
continue
try:
row = StoredPlannerProxy(**row)
except (ScriptError, ValidationError) as e:
except (ScriptError, ValidationError, InvalidPlannerRow) as e:
logger.error(e)
continue
if not row.item.is_group_base: