Skip to content

Commit 5b56720

Browse files
committed
more suggestion & add command clear & fix bug: schedule_tasks will be executed when automatically is False
1 parent 27aefd4 commit 5b56720

File tree

3 files changed

+21
-1
lines changed

3 files changed

+21
-1
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
.idea/
22
debug.sh
33

4+
hooks/__pycache__/
45
test/.pytest_cache/
56
test/__pycache__/

hooks/__init__.py

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,11 @@ def man_run_task(task: str, env_str: str, src: CommandSource, server: PluginServ
144144
e)
145145

146146

147+
def clear_tasks(server: PluginServerInterface, src: CommandSource):
148+
for tsk in cfg.temp_config.task.copy().keys():
149+
tasks.delete_task(tsk, src, server)
150+
151+
147152
def _parse_and_apply_scripts(script: str, server: PluginServerInterface):
148153
try:
149154
# 读取
@@ -286,6 +291,7 @@ def on_load(server: PluginServerInterface, old_module):
286291
Text('name')
287292
.then(
288293
Text('task_type')
294+
.suggests(lambda: tasks.TaskType.__members__)
289295
.then(
290296
GreedyText('command')
291297
.requires(lambda src: src.has_permission(3))
@@ -303,6 +309,7 @@ def on_load(server: PluginServerInterface, old_module):
303309
Integer('exec_interval')
304310
.then(
305311
Text('task_type')
312+
.suggests(lambda: tasks.TaskType.__members__)
306313
.then(
307314
GreedyText('command')
308315
.requires(lambda src: src.has_permission(3))
@@ -318,8 +325,10 @@ def on_load(server: PluginServerInterface, old_module):
318325
Literal('mount')
319326
.then(
320327
Text('task')
328+
.suggests(lambda: cfg.temp_config.task.keys())
321329
.then(
322330
Text('hook')
331+
.suggests(lambda: mount.Hooks.__members__)
323332
.requires(lambda src: src.has_permission(3))
324333
.runs(lambda src, ctx: mount.mount_task(ctx['hook'], ctx['task'], src, server))
325334
)
@@ -329,8 +338,10 @@ def on_load(server: PluginServerInterface, old_module):
329338
Literal('unmount')
330339
.then(
331340
Text('task')
341+
.suggests(lambda: cfg.temp_config.task.keys())
332342
.then(
333343
Text('hook')
344+
.suggests(lambda: mount.Hooks.__members__)
334345
.requires(lambda src: src.has_permission(3))
335346
.runs(lambda src, ctx: mount.unmount_task(ctx['hook'], ctx['task'], src, server))
336347
)
@@ -340,6 +351,7 @@ def on_load(server: PluginServerInterface, old_module):
340351
Literal('delete')
341352
.then(
342353
Text('task')
354+
.suggests(lambda: cfg.temp_config.task.keys())
343355
.requires(lambda src: src.has_permission(3))
344356
.runs(lambda src, ctx: tasks.delete_task(ctx['task'], src, server))
345357
)
@@ -371,13 +383,19 @@ def on_load(server: PluginServerInterface, old_module):
371383
Literal('run')
372384
.then(
373385
Text('task')
386+
.suggests(lambda: cfg.temp_config.task.keys())
374387
.then(
375388
GreedyText('env')
376389
.requires(lambda src: src.has_permission(3))
377390
.runs(lambda src, ctx: man_run_task(ctx['task'], ctx['env'], src, server))
378391
)
379392
)
380393
)
394+
.then(
395+
Literal('clear')
396+
.requires(lambda src: src.has_permission(3))
397+
.runs(lambda src: clear_tasks(server, src))
398+
)
381399
)
382400

383401
trigger_hooks(mount.Hooks.on_plugin_loaded, server,

hooks/schedule_tasks.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ def run(self):
3737
if self.stop_event.is_set():
3838
return
3939
sleep(1.0)
40-
self.execute_task(self.server_inst, 'schedule')
40+
if cfg.config.automatically:
41+
self.execute_task(self.server_inst, 'schedule')
4142

4243

4344
def stop_all_schedule_daemon_threads():

0 commit comments

Comments
 (0)