sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-25 14:48:13 +08:00
Code Activity

Fix: Delay the wrong OpSi tasks in scheduler

Browse Source
This commit is contained in:
LmeSzinc
2021-12-10 17:45:42 +08:00
parent 20d96f43ff
commit 31bc1d32b1
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
module/config/config.py
View File

@@ -326,7 +326,7 @@ class AzurLaneConfig(ConfigUpdater, ManualConfig, GeneratedConfig):
keys = f'{task}.Scheduler.NextRun' keys = f'{task}.Scheduler.NextRun'
current = deep_get(self.data, keys=keys, default=datetime(2020, 1, 1, 0, 0)) current = deep_get(self.data, keys=keys, default=datetime(2020, 1, 1, 0, 0))
if current < next_run: if current < next_run:
logger.info(f'Delay task `{task}`` to {next_run} ({kv})') logger.info(f'Delay task `{task}` to {next_run} ({kv})')
self.modified[keys] = next_run self.modified[keys] = next_run
def is_submarine_call(task): def is_submarine_call(task):
@@ -344,13 +344,13 @@ class AzurLaneConfig(ConfigUpdater, ManualConfig, GeneratedConfig):
tasks = SelectedGrids(['OpsiExplore', 'OpsiObscure', 'OpsiStronghold']) tasks = SelectedGrids(['OpsiExplore', 'OpsiObscure', 'OpsiStronghold'])
delay_tasks(tasks.filter(is_not_force_run).grids, minutes=30) delay_tasks(tasks.filter(is_not_force_run).grids, minutes=30)
if submarine_call: if submarine_call:
tasks = SelectedGrids(['OpsiExplore', 'OpsiDaily', 'OpsiObscure', 'OpsiAbyssal', 'OpsiFleetFilter', tasks = SelectedGrids(['OpsiExplore', 'OpsiDaily', 'OpsiObscure', 'OpsiAbyssal', 'OpsiStronghold',
'OpsiMeowfficerFarming']) 'OpsiMeowfficerFarming'])
delay_tasks(tasks.filter(is_submarine_call).filter(is_not_force_run).grids, minutes=60) delay_tasks(tasks.filter(is_submarine_call).filter(is_not_force_run).grids, minutes=60)
if ap_limit: if ap_limit:
tasks = SelectedGrids(['OpsiExplore', 'OpsiDaily', 'OpsiObscure', 'OpsiAbyssal', 'OpsiFleetFilter', tasks = SelectedGrids(['OpsiExplore', 'OpsiDaily', 'OpsiObscure', 'OpsiAbyssal', 'OpsiStronghold',
'OpsiMeowfficerFarming']) 'OpsiMeowfficerFarming'])
delay_tasks(tasks.filter(is_submarine_call).filter(is_not_force_run).grids, minutes=360) delay_tasks(tasks.filter(is_not_force_run).grids, minutes=360)
self.save() self.save()