refactor (module): improve the implementation of base classes

This commit is contained in:
InfinityPacer
2024-09-26 19:44:35 +08:00
parent ddfcdf9ce2
commit 5efcd6e6be
12 changed files with 186 additions and 194 deletions

View File

@@ -20,11 +20,11 @@ class TelegramModule(_ModuleBase, _MessageBase):
if not clients:
return
self._configs = {}
self._clients = {}
self._instances = {}
for client in clients:
if client.type == "telegram" and client.enabled:
self._configs[client.name] = client
self._clients[client.name] = Telegram(**client.config, name=client.name)
self._instances[client.name] = Telegram(**client.config, name=client.name)
@staticmethod
def get_name() -> str:
@@ -34,16 +34,16 @@ class TelegramModule(_ModuleBase, _MessageBase):
"""
停止模块
"""
for client in self._clients.values():
for client in self._instances.values():
client.stop()
def test(self) -> Optional[Tuple[bool, str]]:
"""
测试模块连接性
"""
if not self._clients:
if not self._instances:
return None
for name, client in self._clients.items():
for name, client in self._instances.items():
state = client.get_state()
if not state:
return False, f"Telegram {name} 未就续"
@@ -92,7 +92,7 @@ class TelegramModule(_ModuleBase, _MessageBase):
client_config = self.get_config(source, 'telegram')
if not client_config:
return None
client: Telegram = self.get_client(source)
client: Telegram = self.get_instance(source)
# 校验token
token = args.get("token")
if not token or token != settings.API_TOKEN:
@@ -136,7 +136,7 @@ class TelegramModule(_ModuleBase, _MessageBase):
:return: 成功或失败
"""
for conf in self._configs.values():
if not self.checkMessage(message, conf.name):
if not self.check_message(message, conf.name):
continue
targets = message.targets
userid = message.userid
@@ -145,7 +145,7 @@ class TelegramModule(_ModuleBase, _MessageBase):
if not userid:
logger.warn(f"用户没有指定 Telegram用户ID消息无法发送")
return
client: Telegram = self.get_client(conf.name)
client: Telegram = self.get_instance(conf.name)
if client:
client.send_msg(title=message.title, text=message.text,
image=message.image, userid=userid, link=message.link)
@@ -158,9 +158,9 @@ class TelegramModule(_ModuleBase, _MessageBase):
:return: 成功或失败
"""
for conf in self._configs.values():
if not self.checkMessage(message, conf.name):
if not self.check_message(message, conf.name):
continue
client: Telegram = self.get_client(conf.name)
client: Telegram = self.get_instance(conf.name)
if client:
client.send_medias_msg(title=message.title, medias=medias,
userid=message.userid, link=message.link)
@@ -173,9 +173,9 @@ class TelegramModule(_ModuleBase, _MessageBase):
:return: 成功或失败
"""
for conf in self._configs.values():
if not self.checkMessage(message, conf.name):
if not self.check_message(message, conf.name):
continue
client: Telegram = self.get_client(conf.name)
client: Telegram = self.get_instance(conf.name)
if client:
client.send_torrents_msg(title=message.title, torrents=torrents,
userid=message.userid, link=message.link)
@@ -185,5 +185,5 @@ class TelegramModule(_ModuleBase, _MessageBase):
注册命令,实现这个函数接收系统可用的命令菜单
:param commands: 命令字典
"""
for client in self._clients.values():
for client in self._instances.values():
client.register_commands(commands)