YoursFunny/ArisuAutoSweeper
1
0
Fork 0
mirror of https://github.com/TheFunny/ArisuAutoSweeper synced 2026-10-17 03:42:17 +00:00
Code Releases Wiki Activity

fix: ensure handlers wait for unknown first

Browse Source
This commit is contained in:
YoursFunny
2026-07-06 22:40:43 +08:00
parent 21a1088ea4
commit bebb68d3b2
1 changed files with 35 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/ui/switch.py
+35 -15
View File
@@ -28,16 +28,18 @@ class Switch:
For example: | [ON] | -> click -> | [OFF] | For example: | [ON] | -> click -> | [OFF] |
""" """
self.name = name self.name = name
self.is_choice = is_selector self.is_selector = is_selector
self.state_list = [] self.state_list = []
def add_state(self, state, check_button, click_button=None): def add_state(self, state, check_button, click_button=None):
""" """
Args: Args:
state (str): state (str): State name but cannot use 'unknown' as state name
check_button (ButtonWrapper): check_button (ButtonWrapper):
click_button (ButtonWrapper): click_button (ButtonWrapper):
""" """
if state == 'unknown':
raise ScriptError(f'Cannot use "unknown" as state name')
self.state_list.append({ self.state_list.append({
'state': state, 'state': state,
'check_button': check_button, 'check_button': check_button,
@@ -96,8 +98,7 @@ class Switch:
if row['state'] == state: if row['state'] == state:
return row return row
logger.warning(f'Switch {self.name} received an invalid state {state}') raise ScriptError(f'Switch {self.name} received an invalid state: {state}')
raise ScriptError(f'Switch {self.name} received an invalid state {state}')
def handle_additional(self, main): def handle_additional(self, main):
""" """
@@ -122,9 +123,9 @@ class Switch:
logger.info(f'{self.name} set to {state}') logger.info(f'{self.name} set to {state}')
self.get_data(state) self.get_data(state)
counter = 0
changed = False changed = False
warning_show_timer = Timer(5, count=10).start() has_known = False
unknown_timer = Timer(5, count=10).start()
click_timer = Timer(1, count=3) click_timer = Timer(1, count=3)
while 1: while 1:
if skip_first_screenshot: if skip_first_screenshot:
@@ -146,20 +147,39 @@ class Switch:
# Warning # Warning
if current == 'unknown': if current == 'unknown':
if warning_show_timer.reached(): if unknown_timer.reached():
logger.warning(f'Unknown {self.name} switch') logger.warning(f'Switch {self.name} has states evaluated to unknown, '
warning_show_timer.reset() f'asset should be re-verified')
if counter >= 1: has_unknown = True
logger.warning(f'{self.name} switch {state} asset has evaluated to unknown too many times, ' unknown_timer.reset()
f'asset should be re-verified') # If unknown_timer never reached, don't click when having an unknown state,
counter += 1 # the unknown state is probably the switching animation.
# If unknown_timer reached once, click target state ignoring whether state is unknown or not,
# the unknown state is probably a new state not yet added.
# By ignoring new states, Switch.set() can still switch among known states.
if not has_unknown:
continue
else:
# Known state, reset timer
unknown_timer.reset()
# Click # Click
if click_timer.reached(): if click_timer.reached():
click_state = state if self.is_choice else current if self.is_selector:
# Click target state to switch
click_state = state
else:
# If this is a selector, click on current state to switch to another
# But 'unknown' is not clickable, if it is, click target state instead
# assuming all selector states share the same position.
if current == 'unknown':
click_state = state
else:
click_state = current
self.click(click_state, main=main) self.click(click_state, main=main)
click_timer.reset()
changed = True changed = True
click_timer.reset()
unknown_timer.reset()
return changed return changed