fix

app/brushtask.py

@@ -6,7 +6,7 @@
 from apscheduler.schedulers.background import BackgroundScheduler
 
 import log
-from app.downloader import Qbittorrent, Transmission
+from app.downloader.client import Qbittorrent, Transmission
 from app.filter import Filter
 from app.helper import DbHelper, DictHelper
 from app.message import Message

app/downloader/__init__.py

@@ -1,5 +1 @@
-from .client.client115 import Client115
-from .client.aria2 import Aria2
-from .client.qbittorrent import Qbittorrent
-from .client.transmission import Transmission
 from .downloader import Downloader

app/downloader/client/__init__.py

@@ -0,0 +1,4 @@
+from .client115 import Client115
+from .aria2 import Aria2
+from .qbittorrent import Qbittorrent
+from .transmission import Transmission

app/downloader/client/aria2.py

@@ -5,7 +5,7 @@
 from app.utils.exception_util import ExceptionUtils
 from app.utils.types import DownloaderType
 from config import Config
-from app.downloader.client.client import IDownloadClient
+from app.downloader.download_client import IDownloadClient
 from app.downloader.client.pyaria2 import PyAria2
 
 

app/downloader/client/client115.py

@@ -1,7 +1,7 @@
 import log
 from app.utils.types import DownloaderType
 from config import Config
-from app.downloader.client.client import IDownloadClient
+from app.downloader.download_client import IDownloadClient
 from app.downloader.client.py115 import Py115
 
 

app/downloader/client/qbittorrent.py

@@ -8,7 +8,7 @@
 
 import log
 import qbittorrentapi
-from app.downloader.client.client import IDownloadClient
+from app.downloader.download_client import IDownloadClient
 from app.utils.exception_util import ExceptionUtils
 from app.utils.types import DownloaderType
 from config import Config

app/downloader/client/transmission.py

@@ -9,7 +9,7 @@
 from app.utils.exception_util import ExceptionUtils
 from app.utils.types import DownloaderType
 from config import Config
-from app.downloader.client.client import IDownloadClient
+from app.downloader.download_client import IDownloadClient
 
 
 class Transmission(IDownloadClient):

app/downloader/downloader.py

@@ -2,7 +2,7 @@
 from threading import Lock
 
 import log
-from app.downloader import Aria2, Client115, Qbittorrent, Transmission
+from app.downloader.client import Aria2, Client115, Qbittorrent, Transmission
 from app.filetransfer import FileTransfer
 from app.helper import DbHelper, ThreadHelper
 from app.media import MetaInfo, Media

app/indexer/__init__.py

@@ -1,4 +0,0 @@
-from .client.builtin import BuiltinIndexer
-from .client.jackett import Jackett
-from .client.prowlarr import Prowlarr
-from .client.rarbg import Rarbg

app/indexer/client/__init__.py

@@ -0,0 +1,4 @@
+from .builtin import BuiltinIndexer
+from .jackett import Jackett
+from .prowlarr import Prowlarr
+from .rarbg import Rarbg

app/mediaserver/__init__.py

@@ -1,5 +1,2 @@
-from .server.emby import Emby
-from .server.jellyfin import Jellyfin
-from .server.plex import Plex
 from .media_server import MediaServer
 from .webhook_event import WebhookEvent

app/mediaserver/client/__init__.py

@@ -0,0 +1,3 @@
+from .emby import Emby
+from .jellyfin import Jellyfin
+from .plex import Plex

app/mediaserver/server/emby.py → app/mediaserver/client/emby.py

@@ -4,14 +4,14 @@
 import log
 from app.utils.exception_util import ExceptionUtils
 from config import Config
-from app.mediaserver.server.server import IMediaServer
+from app.mediaserver.media_client import IMediaClient
 from app.utils.commons import singleton
 from app.utils import RequestUtils, SystemUtils
 from app.utils.types import MediaType, MediaServerType
 
 
 @singleton
-class Emby(IMediaServer):
+class Emby(IMediaClient):
     _apikey = None
     _host = None
     _user = None

app/mediaserver/server/jellyfin.py → app/mediaserver/client/jellyfin.py

@@ -4,13 +4,13 @@
 from app.utils.exception_util import ExceptionUtils
 from app.utils.types import MediaServerType
 from config import Config
-from app.mediaserver.server.server import IMediaServer
+from app.mediaserver.media_client import IMediaClient
 from app.utils.commons import singleton
 from app.utils import RequestUtils, SystemUtils
 
 
 @singleton
-class Jellyfin(IMediaServer):
+class Jellyfin(IMediaClient):
     _apikey = None
     _host = None
     _user = None

app/mediaserver/server/plex.py → app/mediaserver/client/plex.py

@@ -4,13 +4,13 @@
 
 import log
 from config import Config
-from app.mediaserver.server.server import IMediaServer
+from app.mediaserver.media_client import IMediaClient
 from app.utils.commons import singleton
 from plexapi.server import PlexServer
 
 
 @singleton
-class Plex(IMediaServer):
+class Plex(IMediaClient):
     _host = None
     _token = None
     _username = None

app/mediaserver/server/server.py → app/mediaserver/media_client.py

@@ -1,7 +1,7 @@
 from abc import ABCMeta, abstractmethod
 
 
-class IMediaServer(metaclass=ABCMeta):
+class IMediaClient(metaclass=ABCMeta):
 
     @abstractmethod
     def get_status(self):

app/mediaserver/media_server.py

@@ -5,7 +5,7 @@
 from app.helper import ProgressHelper
 from app.utils.types import MediaServerType
 from config import Config
-from app.mediaserver import Emby, Jellyfin, Plex
+from app.mediaserver.client import Emby, Jellyfin, Plex
 
 lock = threading.Lock()
 server_lock = threading.Lock()

app/message/channel/bark.py → app/message/client/bark.py

@@ -1,12 +1,11 @@
 from urllib.parse import quote_plus
 
-import log
-from app.message.channel.channel import IMessageChannel
+from app.message.message_client import IMessageClient
 from app.utils import RequestUtils, StringUtils
 from app.utils.exception_util import ExceptionUtils
 
 
-class Bark(IMessageChannel):
+class Bark(IMessageClient):
     _server = None
     _apikey = None
     _client_config = {}

app/message/channel/gotify.py → app/message/client/gotify.py

@@ -1,9 +1,9 @@
-from app.message.channel.channel import IMessageChannel
+from app.message.message_client import IMessageClient
 from app.utils import RequestUtils, StringUtils
 from app.utils.exception_util import ExceptionUtils
 
 
-class Gotify(IMessageChannel):
+class Gotify(IMessageClient):
     _server = None
     _token = None
     _priority = None

app/message/channel/iyuu.py → app/message/client/iyuu.py

@@ -1,12 +1,11 @@
 from urllib.parse import urlencode
 
-import log
-from app.message.channel.channel import IMessageChannel
+from app.message.message_client import IMessageClient
 from app.utils import RequestUtils
 from app.utils.exception_util import ExceptionUtils
 
 
-class IyuuMsg(IMessageChannel):
+class IyuuMsg(IMessageClient):
     _token = None
     _client_config = {}
 

app/message/channel/pushplus.py → app/message/client/pushplus.py

@@ -1,13 +1,12 @@
 import time
 from urllib.parse import urlencode
 
-import log
-from app.message.channel.channel import IMessageChannel
+from app.message.message_client import IMessageClient
 from app.utils import RequestUtils
 from app.utils.exception_util import ExceptionUtils
 
 
-class PushPlus(IMessageChannel):
+class PushPlus(IMessageClient):
     _token = None
     _topic = None
     _channel = None
@@ -22,7 +21,7 @@ def init_config(self):
         if self._client_config:
             self._token = self._client_config.get('token')
             self._topic = self._client_config.get('topic')
-            self._channel = self._client_config.get('channel')
+            self._channel = self._client_config.get('client')
             self._webhook = self._client_config.get('webhook')
 
     def send_msg(self, title, text="", image="", url="", user_id=""):
@@ -43,7 +42,7 @@ def send_msg(self, title, text="", image="", url="", user_id=""):
         try:
             values = {
                 "token": self._token,
-                "channel": self._channel,
+                "client": self._channel,
                 "topic": self._topic,
                 "webhook": self._webhook,
                 "title": title,

app/message/channel/serverchan.py → app/message/client/serverchan.py

@@ -1,12 +1,11 @@
 from urllib.parse import urlencode
 
-import log
-from app.message.channel.channel import IMessageChannel
+from app.message.message_client import IMessageClient
 from app.utils import RequestUtils
 from app.utils.exception_util import ExceptionUtils
 
 
-class ServerChan(IMessageChannel):
+class ServerChan(IMessageClient):
     _sckey = None
     _client_config = {}
 

app/message/channel/slack.py → app/message/client/slack.py

@@ -1,12 +1,11 @@
-import json
 import re
 from threading import Lock
 
 import requests
 from slack_sdk.errors import SlackApiError
 
 import log
-from app.message.channel.channel import IMessageChannel
+from app.message.message_client import IMessageClient
 from app.utils.exception_util import ExceptionUtils
 from config import Config
 from slack_bolt import App
@@ -15,7 +14,7 @@
 lock = Lock()
 
 
-class Slack(IMessageChannel):
+class Slack(IMessageClient):
     _client_config = {}
     _interactive = False
     _ds_url = None

app/message/channel/telegram.py → app/message/client/telegram.py

@@ -5,7 +5,7 @@
 
 import log
 from app.helper import ThreadHelper
-from app.message.channel.channel import IMessageChannel
+from app.message.message_client import IMessageClient
 from app.utils import RequestUtils
 from app.utils.exception_util import ExceptionUtils
 from config import Config
@@ -14,7 +14,7 @@
 WEBHOOK_STATUS = False
 
 
-class Telegram(IMessageChannel):
+class Telegram(IMessageClient):
     _telegram_token = None
     _telegram_chat_id = None
     _webhook = None

app/message/channel/wechat.py → app/message/client/wechat.py

@@ -2,16 +2,15 @@
 import threading
 from datetime import datetime
 
-import log
-from app.message.channel.channel import IMessageChannel
+from app.message.message_client import IMessageClient
 from app.utils import RequestUtils
 from app.utils.exception_util import ExceptionUtils
 from config import DEFAULT_WECHAT_PROXY
 
 lock = threading.Lock()
 
 
-class WeChat(IMessageChannel):
+class WeChat(IMessageClient):
     _instance = None
     _access_token = None
     _expires_in = None

app/message/message.py

@@ -6,7 +6,7 @@
 from app.utils.commons import singleton
 from config import Config
 from app.helper import DbHelper
-from app.message.channel import Bark, IyuuMsg, PushPlus, ServerChan, Telegram, WeChat, Slack, Gotify
+from app.message.client import Bark, IyuuMsg, PushPlus, ServerChan, Telegram, WeChat, Slack, Gotify
 from app.utils import StringUtils
 from app.message.message_center import MessageCenter
 from app.utils.types import SearchType, MediaType
@@ -23,7 +23,7 @@ class Message:
 
     # 消息通知类型
     MESSAGE_DICT = {
-        "channel": {
+        "client": {
             "telegram": {"name": "Telegram", "img_url": "../static/img/telegram.png", "search_type": SearchType.TG},
             "wechat": {"name": "微信", "img_url": "../static/img/wechat.png", "search_type": SearchType.WX},
             "serverchan": {"name": "Server酱", "img_url": "../static/img/serverchan.png"},
@@ -87,7 +87,7 @@ def init_config(self):
             self._active_clients.append({
                 "name": name,
                 "type": ctype,
-                "search_type": self.MESSAGE_DICT.get('channel').get(ctype, {}).get('search_type'),
+                "search_type": self.MESSAGE_DICT.get('client').get(ctype, {}).get('search_type'),
                 "client": self.__build_client(ctype, config, interactive),
                 "config": config,
                 "switchs": switchs,

app/message/channel/channel.py → app/message/message_client.py

@@ -1,7 +1,14 @@
 from abc import ABCMeta, abstractmethod
 
 
-class IMessageChannel(metaclass=ABCMeta):
+class IMessageClient(metaclass=ABCMeta):
+
+    @abstractmethod
+    def init_config(self):
+        """
+        初始化配置
+        """
+        pass
 
     @abstractmethod
     def send_msg(self, title, text, image, url, user_id):

app/rsschecker.py

@@ -2,7 +2,7 @@
 import traceback
 
 import jsonpath
-from apscheduler.executors.pool import ThreadPoolExecutor, ProcessPoolExecutor
+from apscheduler.executors.pool import ThreadPoolExecutor
 from apscheduler.schedulers.background import BackgroundScheduler
 from lxml import etree
 

app/scheduler.py

@@ -3,7 +3,7 @@
 import random
 import traceback
 
-from apscheduler.executors.pool import ThreadPoolExecutor, ProcessPoolExecutor
+from apscheduler.executors.pool import ThreadPoolExecutor
 from apscheduler.schedulers.background import BackgroundScheduler
 
 import log

app/searcher.py

@@ -3,7 +3,7 @@
 from config import Config
 from app.message import Message
 from app.downloader import Downloader
-from app.indexer import BuiltinIndexer, Jackett, Prowlarr
+from app.indexer.client import BuiltinIndexer, Jackett, Prowlarr
 from app.media import Media
 from app.helper import ProgressHelper
 from app.utils.types import SearchType, MediaType

log.py

@@ -14,6 +14,7 @@
 LOG_QUEUE = deque(maxlen=200)
 LOG_INDEX = 0
 
+
 class Logger:
     logger = None
     __instance = {}

web/action.py

@@ -17,12 +17,13 @@
 import log
 from app.brushtask import BrushTask
 from app.doubansync import DoubanSync
-from app.downloader import Qbittorrent, Transmission, Downloader
+from app.downloader import Downloader
+from app.downloader.client import Qbittorrent, Transmission
 from app.filetransfer import FileTransfer
 from app.filter import Filter
 from app.helper import DbHelper, DictHelper, ChromeHelper, ProgressHelper, ThreadHelper, \
     MetaHelper, DisplayHelper, WordsHelper
-from app.indexer import BuiltinIndexer
+from app.indexer.client import BuiltinIndexer
 from app.media import Category, Media, MetaInfo, MetaBase
 from app.media.bangumi import Bangumi
 from app.media.douban import DouBan