fix Config reload

app/modules/emby/__init__.py

@@ -1,18 +1,16 @@
 from typing import Any, Generator, List, Optional, Tuple, Union
 
 from app import schemas
-from app.core.config import on_config_change
 from app.core.context import MediaInfo
-from app.core.event import eventmanager
+from app.core.event import eventmanager, Event
 from app.log import logger
 from app.modules import _MediaServerBase, _ModuleBase
 from app.modules.emby.emby import Emby
-from app.schemas.types import MediaType, ModuleType, ChainEventType, MediaServerType, SystemConfigKey
+from app.schemas.types import MediaType, ModuleType, ChainEventType, MediaServerType, SystemConfigKey, EventType
 
 
 class EmbyModule(_ModuleBase, _MediaServerBase[Emby]):
 
-    @on_config_change([SystemConfigKey.MediaServers.value])
     def init_module(self) -> None:
         """
         初始化模块
@@ -20,6 +18,19 @@ class EmbyModule(_ModuleBase, _MediaServerBase[Emby]):
         super().init_service(service_name=Emby.__name__.lower(),
                              service_type=lambda conf: Emby(**conf.config, sync_libraries=conf.sync_libraries))
 
+    @eventmanager.register(EventType.ConfigChanged)
+    def handle_config_changed(self, event: Event):
+        """
+        处理配置变更事件
+        :param event: 事件对象
+        """
+        if not event:
+            return
+        event_data: schemas.ConfigChangeEventData = event.event_data
+        if event_data.key not in [SystemConfigKey.MediaServers.value]:
+            return
+        self.init_module()
+
     @staticmethod
     def get_name() -> str:
         return "Emby"
@@ -271,7 +282,8 @@ class EmbyModule(_ModuleBase, _MediaServerBase[Emby]):
         ) for season, episodes in seasoninfo.items()]
 
     def mediaserver_playing(self, server: str,
-                            count: Optional[int] = 20, username: Optional[str] = None) -> List[schemas.MediaServerPlayItem]:
+                            count: Optional[int] = 20, username: Optional[str] = None) -> List[
+        schemas.MediaServerPlayItem]:
         """
         获取媒体服务器正在播放信息
         """
@@ -290,7 +302,8 @@ class EmbyModule(_ModuleBase, _MediaServerBase[Emby]):
         return server_obj.get_play_url(item_id)
 
     def mediaserver_latest(self, server: Optional[str] = None,
-                           count: Optional[int] = 20, username: Optional[str] = None) -> List[schemas.MediaServerPlayItem]:
+                           count: Optional[int] = 20, username: Optional[str] = None) -> List[
+        schemas.MediaServerPlayItem]:
         """
         获取媒体服务器最新入库条目
         """

app/modules/jellyfin/__init__.py

@@ -1,19 +1,17 @@
 from typing import Any, Generator, List, Optional, Tuple, Union
 
 from app import schemas
-from app.core.config import on_config_change
 from app.core.context import MediaInfo
-from app.core.event import eventmanager
+from app.core.event import eventmanager, Event
 from app.log import logger
 from app.modules import _MediaServerBase, _ModuleBase
 from app.modules.jellyfin.jellyfin import Jellyfin
 from app.schemas import AuthCredentials, AuthInterceptCredentials
-from app.schemas.types import MediaType, ModuleType, ChainEventType, MediaServerType, SystemConfigKey
+from app.schemas.types import MediaType, ModuleType, ChainEventType, MediaServerType, SystemConfigKey, EventType
 
 
 class JellyfinModule(_ModuleBase, _MediaServerBase[Jellyfin]):
 
-    @on_config_change([SystemConfigKey.MediaServers.value])
     def init_module(self) -> None:
         """
         初始化模块
@@ -21,6 +19,19 @@ class JellyfinModule(_ModuleBase, _MediaServerBase[Jellyfin]):
         super().init_service(service_name=Jellyfin.__name__.lower(),
                              service_type=lambda conf: Jellyfin(**conf.config, sync_libraries=conf.sync_libraries))
 
+    @eventmanager.register(EventType.ConfigChanged)
+    def handle_config_changed(self, event: Event):
+        """
+        处理配置变更事件
+        :param event: 事件对象
+        """
+        if not event:
+            return
+        event_data: schemas.ConfigChangeEventData = event.event_data
+        if event_data.key not in [SystemConfigKey.MediaServers.value]:
+            return
+        self.init_module()
+
     @staticmethod
     def get_name() -> str:
         return "Jellyfin"

app/modules/plex/__init__.py

@@ -1,19 +1,17 @@
 from typing import Optional, Tuple, Union, Any, List, Generator
 
 from app import schemas
-from app.core.config import on_config_change
 from app.core.context import MediaInfo
-from app.core.event import eventmanager
+from app.core.event import eventmanager, Event
 from app.log import logger
 from app.modules import _ModuleBase, _MediaServerBase
 from app.modules.plex.plex import Plex
 from app.schemas import AuthCredentials, AuthInterceptCredentials
-from app.schemas.types import MediaType, ModuleType, ChainEventType, MediaServerType, SystemConfigKey
+from app.schemas.types import MediaType, ModuleType, ChainEventType, MediaServerType, SystemConfigKey, EventType
 
 
 class PlexModule(_ModuleBase, _MediaServerBase[Plex]):
 
-    @on_config_change([SystemConfigKey.MediaServers.value])
     def init_module(self) -> None:
         """
         初始化模块
@@ -21,6 +19,19 @@ class PlexModule(_ModuleBase, _MediaServerBase[Plex]):
         super().init_service(service_name=Plex.__name__.lower(),
                              service_type=lambda conf: Plex(**conf.config, sync_libraries=conf.sync_libraries))
 
+    @eventmanager.register(EventType.ConfigChanged)
+    def handle_config_changed(self, event: Event):
+        """
+        处理配置变更事件
+        :param event: 事件对象
+        """
+        if not event:
+            return
+        event_data: schemas.ConfigChangeEventData = event.event_data
+        if event_data.key not in [SystemConfigKey.MediaServers.value]:
+            return
+        self.init_module()
+
     @staticmethod
     def get_name() -> str:
         return "Plex"

app/modules/qbittorrent/__init__.py

@@ -5,19 +5,19 @@ from qbittorrentapi import TorrentFilesList
 from torrentool.torrent import Torrent
 
 from app import schemas
-from app.core.config import settings, on_config_change
+from app.core.config import settings
 from app.core.metainfo import MetaInfo
+from app.core.event import eventmanager, Event
 from app.log import logger
 from app.modules import _ModuleBase, _DownloaderBase
 from app.modules.qbittorrent.qbittorrent import Qbittorrent
 from app.schemas import TransferTorrent, DownloadingTorrent
-from app.schemas.types import TorrentStatus, ModuleType, DownloaderType, SystemConfigKey
+from app.schemas.types import TorrentStatus, ModuleType, DownloaderType, SystemConfigKey, EventType
 from app.utils.string import StringUtils
 
 
 class QbittorrentModule(_ModuleBase, _DownloaderBase[Qbittorrent]):
 
-    @on_config_change([SystemConfigKey.Downloaders.value])
     def init_module(self) -> None:
         """
         初始化模块
@@ -25,6 +25,19 @@ class QbittorrentModule(_ModuleBase, _DownloaderBase[Qbittorrent]):
         super().init_service(service_name=Qbittorrent.__name__.lower(),
                              service_type=Qbittorrent)
 
+    @eventmanager.register(EventType.ConfigChanged)
+    def handle_config_changed(self, event: Event):
+        """
+        处理配置变更事件
+        :param event: 事件对象
+        """
+        if not event:
+            return
+        event_data: schemas.ConfigChangeEventData = event.event_data
+        if event_data.key not in [SystemConfigKey.Downloaders.value]:
+            return
+        self.init_module()
+
     @staticmethod
     def get_name() -> str:
         return "Qbittorrent"
@@ -287,7 +300,8 @@ class QbittorrentModule(_ModuleBase, _DownloaderBase[Qbittorrent]):
                         dlspeed=StringUtils.str_filesize(torrent.get('dlspeed')),
                         upspeed=StringUtils.str_filesize(torrent.get('upspeed')),
                         left_time=StringUtils.str_secends(
-                            (torrent.get('total_size') - torrent.get('completed')) / torrent.get('dlspeed')) if torrent.get(
+                            (torrent.get('total_size') - torrent.get('completed')) / torrent.get(
+                                'dlspeed')) if torrent.get(
                             'dlspeed') > 0 else ''
                     ))
         else:

app/modules/slack/__init__.py

@@ -2,18 +2,17 @@ import json
 import re
 from typing import Optional, Union, List, Tuple, Any
 
-from app.core.config import on_config_change
 from app.core.context import MediaInfo, Context
+from app.core.event import eventmanager, Event
 from app.log import logger
 from app.modules import _ModuleBase, _MessageBase
 from app.modules.slack.slack import Slack
-from app.schemas import MessageChannel, CommingMessage, Notification
-from app.schemas.types import ModuleType, SystemConfigKey
+from app.schemas import MessageChannel, CommingMessage, Notification, ConfigChangeEventData
+from app.schemas.types import ModuleType, SystemConfigKey, EventType
 
 
 class SlackModule(_ModuleBase, _MessageBase[Slack]):
 
-    @on_config_change([SystemConfigKey.Notifications.value])
     def init_module(self) -> None:
         """
         初始化模块
@@ -22,6 +21,19 @@ class SlackModule(_ModuleBase, _MessageBase[Slack]):
                              service_type=Slack)
         self._channel = MessageChannel.Slack
 
+    @eventmanager.register(EventType.ConfigChanged)
+    def handle_config_changed(self, event: Event):
+        """
+        处理配置变更事件
+        :param event: 事件对象
+        """
+        if not event:
+            return
+        event_data: ConfigChangeEventData = event.event_data
+        if event_data.key not in [SystemConfigKey.Notifications.value]:
+            return
+        self.init_module()
+
     @staticmethod
     def get_name() -> str:
         return "Slack"

app/modules/synologychat/__init__.py

@@ -1,17 +1,16 @@
 from typing import Optional, Union, List, Tuple, Any
 
-from app.core.config import on_config_change
 from app.core.context import MediaInfo, Context
+from app.core.event import eventmanager, Event
 from app.log import logger
 from app.modules import _ModuleBase, _MessageBase
 from app.modules.synologychat.synologychat import SynologyChat
-from app.schemas import MessageChannel, CommingMessage, Notification
-from app.schemas.types import ModuleType, SystemConfigKey
+from app.schemas import MessageChannel, CommingMessage, Notification, ConfigChangeEventData
+from app.schemas.types import ModuleType, SystemConfigKey, EventType
 
 
 class SynologyChatModule(_ModuleBase, _MessageBase[SynologyChat]):
 
-    @on_config_change([SystemConfigKey.Notifications.value])
     def init_module(self) -> None:
         """
         初始化模块
@@ -20,6 +19,19 @@ class SynologyChatModule(_ModuleBase, _MessageBase[SynologyChat]):
                              service_type=SynologyChat)
         self._channel = MessageChannel.SynologyChat
 
+    @eventmanager.register(EventType.ConfigChanged)
+    def handle_config_changed(self, event: Event):
+        """
+        处理配置变更事件
+        :param event: 事件对象
+        """
+        if not event:
+            return
+        event_data: ConfigChangeEventData = event.event_data
+        if event_data.key not in [SystemConfigKey.Notifications.value]:
+            return
+        self.init_module()
+
     @staticmethod
     def get_name() -> str:
         return "Synology Chat"

app/modules/telegram/__init__.py

@@ -1,21 +1,21 @@
 import copy
 import json
-from typing import Optional, Union, List, Tuple, Any, Dict
+from typing import Dict
+from typing import Optional, Union, List, Tuple, Any
 
-from app.core.config import on_config_change
 from app.core.context import MediaInfo, Context
+from app.core.event import Event
 from app.core.event import eventmanager
 from app.log import logger
 from app.modules import _ModuleBase, _MessageBase
 from app.modules.telegram.telegram import Telegram
-from app.schemas import MessageChannel, CommingMessage, Notification, CommandRegisterEventData
-from app.schemas.types import ModuleType, ChainEventType, SystemConfigKey
+from app.schemas import MessageChannel, CommingMessage, Notification, CommandRegisterEventData, ConfigChangeEventData
+from app.schemas.types import ModuleType, ChainEventType, SystemConfigKey, EventType
 from app.utils.structures import DictUtils
 
 
 class TelegramModule(_ModuleBase, _MessageBase[Telegram]):
 
-    @on_config_change([SystemConfigKey.Notifications.value])
     def init_module(self) -> None:
         """
         初始化模块
@@ -24,6 +24,19 @@ class TelegramModule(_ModuleBase, _MessageBase[Telegram]):
                              service_type=Telegram)
         self._channel = MessageChannel.Telegram
 
+    @eventmanager.register(EventType.ConfigChanged)
+    def handle_config_changed(self, event: Event):
+        """
+        处理配置变更事件
+        :param event: 事件对象
+        """
+        if not event:
+            return
+        event_data: ConfigChangeEventData = event.event_data
+        if event_data.key not in [SystemConfigKey.Notifications.value]:
+            return
+        self.init_module()
+
     @staticmethod
     def get_name() -> str:
         return "Telegram"

app/modules/transmission/__init__.py

@@ -5,19 +5,19 @@ from torrentool.torrent import Torrent
 from transmission_rpc import File
 
 from app import schemas
-from app.core.config import settings, on_config_change
+from app.core.config import settings
 from app.core.metainfo import MetaInfo
+from app.core.event import eventmanager, Event
 from app.log import logger
 from app.modules import _ModuleBase, _DownloaderBase
 from app.modules.transmission.transmission import Transmission
 from app.schemas import TransferTorrent, DownloadingTorrent
-from app.schemas.types import TorrentStatus, ModuleType, DownloaderType, SystemConfigKey
+from app.schemas.types import TorrentStatus, ModuleType, DownloaderType, SystemConfigKey, EventType
 from app.utils.string import StringUtils
 
 
 class TransmissionModule(_ModuleBase, _DownloaderBase[Transmission]):
 
-    @on_config_change([SystemConfigKey.Downloaders.value])
     def init_module(self) -> None:
         """
         初始化模块
@@ -25,6 +25,19 @@ class TransmissionModule(_ModuleBase, _DownloaderBase[Transmission]):
         super().init_service(service_name=Transmission.__name__.lower(),
                              service_type=Transmission)
 
+    @eventmanager.register(EventType.ConfigChanged)
+    def handle_config_changed(self, event: Event):
+        """
+        处理配置变更事件
+        :param event: 事件对象
+        """
+        if not event:
+            return
+        event_data: schemas.ConfigChangeEventData = event.event_data
+        if event_data.key not in [SystemConfigKey.Downloaders.value]:
+            return
+        self.init_module()
+
     @staticmethod
     def get_name() -> str:
         return "Transmission"

app/modules/trimemedia/__init__.py

@@ -1,19 +1,17 @@
 from typing import Any, Generator, List, Optional, Tuple, Union
 
 from app import schemas
-from app.core.config import on_config_change
 from app.core.context import MediaInfo
-from app.core.event import eventmanager
+from app.core.event import eventmanager, Event
 from app.log import logger
 from app.modules import _MediaServerBase, _ModuleBase
 from app.modules.trimemedia.trimemedia import TrimeMedia
 from app.schemas import AuthCredentials, AuthInterceptCredentials
-from app.schemas.types import ChainEventType, MediaServerType, MediaType, ModuleType, SystemConfigKey
+from app.schemas.types import ChainEventType, MediaServerType, MediaType, ModuleType, SystemConfigKey, EventType
 
 
 class TrimeMediaModule(_ModuleBase, _MediaServerBase[TrimeMedia]):
 
-    @on_config_change([SystemConfigKey.MediaServers.value])
     def init_module(self) -> None:
         """
         初始化模块
@@ -25,6 +23,19 @@ class TrimeMediaModule(_ModuleBase, _MediaServerBase[TrimeMedia]):
             ),
         )
 
+    @eventmanager.register(EventType.ConfigChanged)
+    def handle_config_changed(self, event: Event):
+        """
+        处理配置变更事件
+        :param event: 事件对象
+        """
+        if not event:
+            return
+        event_data: schemas.ConfigChangeEventData = event.event_data
+        if event_data.key not in [SystemConfigKey.MediaServers.value]:
+            return
+        self.init_module()
+
     @staticmethod
     def get_name() -> str:
         return "飞牛影视"

app/modules/vocechat/__init__.py

@@ -1,18 +1,17 @@
 import json
 from typing import Optional, Union, List, Tuple, Any, Dict
 
-from app.core.config import on_config_change
 from app.core.context import Context, MediaInfo
+from app.core.event import eventmanager, Event
 from app.log import logger
 from app.modules import _ModuleBase, _MessageBase
 from app.modules.vocechat.vocechat import VoceChat
-from app.schemas import MessageChannel, CommingMessage, Notification
-from app.schemas.types import ModuleType, SystemConfigKey
+from app.schemas import MessageChannel, CommingMessage, Notification, ConfigChangeEventData
+from app.schemas.types import ModuleType, SystemConfigKey, EventType
 
 
 class VoceChatModule(_ModuleBase, _MessageBase[VoceChat]):
 
-    @on_config_change([SystemConfigKey.Notifications.value])
     def init_module(self) -> None:
         """
         初始化模块
@@ -21,6 +20,19 @@ class VoceChatModule(_ModuleBase, _MessageBase[VoceChat]):
                              service_type=VoceChat)
         self._channel = MessageChannel.VoceChat
 
+    @eventmanager.register(EventType.ConfigChanged)
+    def handle_config_changed(self, event: Event):
+        """
+        处理配置变更事件
+        :param event: 事件对象
+        """
+        if not event:
+            return
+        event_data: ConfigChangeEventData = event.event_data
+        if event_data.key not in [SystemConfigKey.Notifications.value]:
+            return
+        self.init_module()
+
     @staticmethod
     def get_name() -> str:
         return "VoceChat"

app/modules/webpush/__init__.py

@@ -3,16 +3,16 @@ from typing import Union, Tuple
 
 from pywebpush import webpush, WebPushException
 
-from app.core.config import global_vars, settings, on_config_change
+from app.core.config import global_vars, settings
+from app.core.event import eventmanager, Event
 from app.log import logger
 from app.modules import _ModuleBase, _MessageBase
-from app.schemas import Notification
-from app.schemas.types import ModuleType, MessageChannel, SystemConfigKey
+from app.schemas import Notification, ConfigChangeEventData
+from app.schemas.types import ModuleType, MessageChannel, SystemConfigKey, EventType
 
 
 class WebPushModule(_ModuleBase, _MessageBase):
 
-    @on_config_change([SystemConfigKey.Notifications.value])
     def init_module(self) -> None:
         """
         初始化模块
@@ -20,6 +20,19 @@ class WebPushModule(_ModuleBase, _MessageBase):
         super().init_service(service_name=self.get_name().lower())
         self._channel = MessageChannel.WebPush
 
+    @eventmanager.register(EventType.ConfigChanged)
+    def handle_config_changed(self, event: Event):
+        """
+        处理配置变更事件
+        :param event: 事件对象
+        """
+        if not event:
+            return
+        event_data: ConfigChangeEventData = event.event_data
+        if event_data.key not in [SystemConfigKey.Notifications.value]:
+            return
+        self.init_module()
+
     @staticmethod
     def get_name() -> str:
         return "WebPush"

app/modules/wechat/__init__.py

@@ -2,22 +2,20 @@ import copy
 import xml.dom.minidom
 from typing import Optional, Union, List, Tuple, Any, Dict
 
-from app.core.config import on_config_change
 from app.core.context import Context, MediaInfo
-from app.core.event import eventmanager
+from app.core.event import Event, eventmanager
 from app.log import logger
 from app.modules import _ModuleBase, _MessageBase
 from app.modules.wechat.WXBizMsgCrypt3 import WXBizMsgCrypt
 from app.modules.wechat.wechat import WeChat
-from app.schemas import MessageChannel, CommingMessage, Notification, CommandRegisterEventData
-from app.schemas.types import ModuleType, ChainEventType, SystemConfigKey
+from app.schemas import MessageChannel, CommingMessage, Notification, CommandRegisterEventData, ConfigChangeEventData
+from app.schemas.types import ModuleType, ChainEventType, SystemConfigKey, EventType
 from app.utils.dom import DomUtils
 from app.utils.structures import DictUtils
 
 
 class WechatModule(_ModuleBase, _MessageBase[WeChat]):
 
-    @on_config_change([SystemConfigKey.Notifications.value])
     def init_module(self) -> None:
         """
         初始化模块
@@ -26,6 +24,19 @@ class WechatModule(_ModuleBase, _MessageBase[WeChat]):
                              service_type=WeChat)
         self._channel = MessageChannel.Wechat
 
+    @eventmanager.register(EventType.ConfigChanged)
+    def handle_config_changed(self, event: Event):
+        """
+        处理配置变更事件
+        :param event: 事件对象
+        """
+        if not event:
+            return
+        event_data: ConfigChangeEventData = event.event_data
+        if event_data.key not in [SystemConfigKey.Notifications.value]:
+            return
+        self.init_module()
+
     @staticmethod
     def get_name() -> str:
         return "微信"