From 3caf02e8b563afec81c8c73aebdb58677f66afff Mon Sep 17 00:00:00 2001 From: Hermes Agent Date: Sat, 16 May 2026 15:59:45 +0800 Subject: [PATCH] feat: simplify simadmin restart target menu --- plugins/simadmin/simadmin_multi.py | 10 ++++++++-- py/simadmin_multi.py | 10 ++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/plugins/simadmin/simadmin_multi.py b/plugins/simadmin/simadmin_multi.py index 229b10e..812081a 100644 --- a/plugins/simadmin/simadmin_multi.py +++ b/plugins/simadmin/simadmin_multi.py @@ -12,7 +12,7 @@ #[priority: 999] #[platform: qq,qb,wx,wb,tg,tb,fs,we,web,wxmp] #[open_source: true] -#[version: 1.3.3] +#[version: 1.3.4] #[public: false] #[price: 0] #[description: 管理员专用:兼容多个 SimAdmin 实例,支持多级菜单配置管理、状态查询和短信发送。配置桶 otto/simadmin_instances。] @@ -234,6 +234,12 @@ def instance_brief(item, idx=None): ) +def instance_short(item, idx=None): + prefix = "" if idx is None else "%s. " % idx + state = "启用" if item.get("enabled") else "禁用" + return "%s%s [%s]" % (prefix, item["name"], state) + + def request_json(instance, method, path, body=None): url = instance["base_url"] + path data = None @@ -527,7 +533,7 @@ def choose_restart_targets(sender, action_spec): raise SimAdminError("没有启用的 SimAdmin 实例") lines = ["%s:请选择设备" % action_spec["label"]] for idx, item in enumerate(all_instances, 1): - lines.append(instance_brief(item, idx)) + lines.append(instance_short(item, idx)) lines.extend([ "", "a. 全部启用设备", diff --git a/py/simadmin_multi.py b/py/simadmin_multi.py index 229b10e..812081a 100644 --- a/py/simadmin_multi.py +++ b/py/simadmin_multi.py @@ -12,7 +12,7 @@ #[priority: 999] #[platform: qq,qb,wx,wb,tg,tb,fs,we,web,wxmp] #[open_source: true] -#[version: 1.3.3] +#[version: 1.3.4] #[public: false] #[price: 0] #[description: 管理员专用:兼容多个 SimAdmin 实例,支持多级菜单配置管理、状态查询和短信发送。配置桶 otto/simadmin_instances。] @@ -234,6 +234,12 @@ def instance_brief(item, idx=None): ) +def instance_short(item, idx=None): + prefix = "" if idx is None else "%s. " % idx + state = "启用" if item.get("enabled") else "禁用" + return "%s%s [%s]" % (prefix, item["name"], state) + + def request_json(instance, method, path, body=None): url = instance["base_url"] + path data = None @@ -527,7 +533,7 @@ def choose_restart_targets(sender, action_spec): raise SimAdminError("没有启用的 SimAdmin 实例") lines = ["%s:请选择设备" % action_spec["label"]] for idx, item in enumerate(all_instances, 1): - lines.append(instance_brief(item, idx)) + lines.append(instance_short(item, idx)) lines.extend([ "", "a. 全部启用设备",