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

Fix: Move 0 validator & limit need_synthesize (#518)

Browse Source 
* Fix: move 0 validator from val_value to from_config

* Fix: need_synthesize limit to calyx & trace

* Fix: change order in from_config

* Fix: change exception to log

* Fix: delete InvalidPlannerRow
This commit is contained in:
Yinhr 2024-06-15 12:43:44 +08:00 committed by GitHub
parent 726a829e89
commit 62de353ced
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tasks/planner/model.py
View File

@ -99,10 +99,6 @@ SET_ROW_EXCLUDE = {
}
class InvalidPlannerRow(Exception):
pass
class StoredPlannerProxy(BaseModelWithFallback):
item: ITEM_TYPES
value: int | MultiValue = 0
@ -133,8 +129,6 @@ class StoredPlannerProxy(BaseModelWithFallback):
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 '
@ -148,8 +142,6 @@ 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')
@ -425,7 +417,7 @@ class StoredPlannerProxy(BaseModelWithFallback):
return self.progress < 100
def need_synthesize(self):
if self.item.has_group_base:
if self.item.is_ItemCalyx or self.item.is_ItemTrace:
return self.synthesize.green > 0 or self.synthesize.blue > 0 or self.synthesize.purple > 0
else:
return False
@ -502,12 +494,20 @@ class PlannerProgressParser:
continue
try:
row = StoredPlannerProxy(**row)
except (ScriptError, ValidationError, InvalidPlannerRow) as e:
except (ScriptError, ValidationError) as e:
logger.error(e)
continue
if not row.item.is_group_base:
logger.error(f'from_config: item is not group base {row}')
continue
if row.item.has_group_base:
if row.total.equivalent_green() <= 0:
logger.error(f'Planner item {row.item} has invalid total={row.total}, drop')
continue
else:
if row.total <= 0:
logger.error(f'Planner item {row.item} has invalid total={row.total}, drop')
continue
row.update(time=False)
self.rows[row.item.name] = row
return self