Skip to content

Commit a46fb59

Browse files
committed
Fix: raise error when handle_storage_full fail repeats
1 parent 61c9d0d commit a46fb59

File tree

1 file changed

+13
-4
lines changed

1 file changed

+13
-4
lines changed

module/equipment/equipment_code.py

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
from module.config.config import AzurLaneConfig
55
from module.equipment.assets import *
6+
from module.exception import RequestHumanTakeover
67
from module.logger import logger
78
from module.storage.assets import EQUIPMENT_FULL
89
from module.storage.storage import StorageHandler
@@ -227,14 +228,18 @@ def clear_all_equip(self):
227228
if self.codes.__getattribute__(ship) is None:
228229
self.export_equip_code(ship)
229230
self.clear_equip_preview()
230-
while 1:
231+
for _ in range(5):
231232
success = self.confirm_equip_preview()
232233
if success:
233-
break
234+
return True
234235
else:
235236
self.handle_storage_full()
236237
self.clear_equip_preview()
237238

239+
raise RequestHumanTakeover(
240+
f'Failed to clear all equipment for {ship}, please check manually.'
241+
)
242+
238243
def apply_equip_code(self, code=None):
239244
self.enter_equip_code_page()
240245
self.clear_equip_preview()
@@ -246,7 +251,7 @@ def apply_equip_code(self, code=None):
246251
logger.info(f'Apply gear code {code} for {ship}')
247252
else:
248253
logger.info(f'Forcefully apply gear code {code} to current ship.')
249-
while 1:
254+
for _ in range(5):
250255
if code is not None and code != EMPTY_GEAR_CODE:
251256
self.enter_equip_code_input_mode()
252257
self.device.text_input_and_confirm(code, clear=True)
@@ -256,7 +261,11 @@ def apply_equip_code(self, code=None):
256261
success = self.confirm_equip_preview()
257262
if success:
258263
logger.info("Gear code import complete.")
259-
break
264+
return True
260265
else:
261266
self.handle_storage_full()
262267
self.clear_equip_preview()
268+
269+
raise RequestHumanTakeover(
270+
f'Failed to apply equipment for {ship}, please check manually.'
271+
)

0 commit comments

Comments
 (0)