fix

app/api/endpoints/douban.py

@@ -1,9 +1,7 @@
 from fastapi import APIRouter, Depends, HTTPException, BackgroundTasks
-from sqlalchemy.orm import Session
 
 from app import schemas
 from app.chain.douban_sync import DoubanSyncChain
-from app.db import get_db
 from app.db.models.user import User
 from app.db.userauth import get_current_active_superuser
 

app/api/endpoints/login.py

@@ -6,7 +6,8 @@ from fastapi.security import OAuth2PasswordRequestForm
 from sqlalchemy.orm import Session
 
 from app import schemas
-from app.core import security, settings
+from app.core import security
+from app.core.config import settings
 from app.db import get_db
 from app.db.models.user import User
 

app/api/endpoints/messages.py

@@ -5,7 +5,7 @@ from fastapi import Request
 
 from app import schemas
 from app.chain.user_message import UserMessageChain
-from app.core import settings
+from app.core.config import settings
 from app.log import logger
 from app.modules.wechat.WXBizMsgCrypt3 import WXBizMsgCrypt
 

app/api/endpoints/subscribes.py

@@ -5,7 +5,7 @@ from sqlalchemy.orm import Session
 
 from app import schemas
 from app.chain.subscribe import SubscribeChain
-from app.core import settings
+from app.core.config import settings
 from app.db import get_db
 from app.db.models.subscribe import Subscribe
 from app.db.models.user import User

app/api/endpoints/webhooks.py

@@ -3,7 +3,7 @@ from fastapi import APIRouter, BackgroundTasks, Request
 
 from app import schemas
 from app.chain.webhook_message import WebhookMessageChain
-from app.core import settings
+from app.core.config import settings
 
 router = APIRouter()
 

app/chain/__init__.py

@@ -5,7 +5,9 @@ from typing import Optional, Any, Tuple, List, Set, Union
 
 from ruamel.yaml import CommentedMap
 
-from app.core import Context, ModuleManager, MediaInfo, TorrentInfo
+from app.core.context import Context
+from app.core.module_manager import ModuleManager
+from app.core.context import MediaInfo, TorrentInfo
 from app.core.meta import MetaBase
 from app.log import logger
 from app.utils.singleton import AbstractSingleton, Singleton

app/chain/common.py

@@ -3,8 +3,7 @@ from pathlib import Path
 from typing import List, Optional, Tuple, Set, Dict
 
 from app.chain import ChainBase
-from app.core import MediaInfo
+from app.core.context import MediaInfo, TorrentInfo, Context
-from app.core import TorrentInfo, Context
 from app.core.meta import MetaBase
 from app.helper.torrent import TorrentHelper
 from app.log import logger

app/chain/cookiecloud.py

@@ -1,7 +1,7 @@
 from typing import Tuple
 
 from app.chain import ChainBase
-from app.core import settings
+from app.core.config import settings
 from app.db.sites import Sites
 from app.helper.cookiecloud import CookieCloudHelper
 from app.helper.sites import SitesHelper

app/chain/douban_sync.py

@@ -4,7 +4,9 @@ from typing import Optional
 from app.chain import ChainBase
 from app.chain.common import CommonChain
 from app.chain.search import SearchChain
-from app.core import settings, MetaInfo, MediaInfo
+from app.core.config import settings
+from app.core.meta_info import MetaInfo
+from app.core.context import MediaInfo
 from app.db.subscribes import Subscribes
 from app.helper.rss import RssHelper
 from app.log import logger

app/chain/identify.py

@@ -1,7 +1,8 @@
 from typing import Optional
 
 from app.chain import ChainBase
-from app.core import Context, MetaInfo, MediaInfo
+from app.core.meta_info import MetaInfo
+from app.core.context import Context, MediaInfo
 from app.log import logger
 
 

app/chain/search.py

@@ -2,7 +2,9 @@ from typing import Optional, List
 
 from app.chain import ChainBase
 from app.chain.common import CommonChain
-from app.core import Context, MetaInfo, MediaInfo, TorrentInfo, settings
+from app.core.context import Context, MediaInfo, TorrentInfo
+from app.core.config import settings
+from app.core.meta_info import MetaInfo
 from app.core.meta import MetaBase
 from app.helper.sites import SitesHelper
 from app.log import logger

app/chain/subscribe.py

@@ -3,7 +3,9 @@ from typing import Dict, List, Optional
 from app.chain import ChainBase
 from app.chain.common import CommonChain
 from app.chain.search import SearchChain
-from app.core import MetaInfo, TorrentInfo, Context, MediaInfo, settings
+from app.core.meta_info import MetaInfo
+from app.core.context import TorrentInfo, Context, MediaInfo
+from app.core.config import settings
 from app.db.subscribes import Subscribes
 from app.helper.sites import SitesHelper
 from app.log import logger

app/chain/transfer.py

@@ -1,7 +1,9 @@
 from typing import List, Optional
 
 from app.chain import ChainBase
-from app.core import MetaInfo, MediaInfo, settings
+from app.core.meta_info import MetaInfo
+from app.core.context import MediaInfo
+from app.core.config import settings
 from app.core.meta import MetaBase
 from app.log import logger
 from app.utils.string import StringUtils

app/chain/user_message.py

@@ -2,7 +2,9 @@ from typing import Any
 
 from app.chain.common import *
 from app.chain.search import SearchChain
-from app.core import MediaInfo, TorrentInfo, MetaInfo, EventManager
+from app.core.context import MediaInfo, TorrentInfo
+from app.core.meta_info import MetaInfo
+from app.core.event_manager import EventManager
 from app.db.subscribes import Subscribes
 from app.log import logger
 from app.utils.types import EventType

app/command.py

@@ -7,7 +7,8 @@ from app.chain.cookiecloud import CookieCloudChain
 from app.chain.douban_sync import DoubanSyncChain
 from app.chain.subscribe import SubscribeChain
 from app.chain.transfer import TransferChain
-from app.core import eventmanager, PluginManager, EventManager
+from app.core.event_manager import eventmanager, EventManager
+from app.core.plugin_manager import PluginManager
 from app.core.event_manager import Event as ManagerEvent
 from app.log import logger
 from app.utils.singleton import Singleton

app/core/__init__.py

@@ -1,6 +0,0 @@
-from .config import settings
-from .event_manager import eventmanager, EventManager
-from .meta_info import MetaInfo
-from .module_manager import ModuleManager
-from .plugin_manager import PluginManager
-from .context import Context, MediaInfo, TorrentInfo

app/core/module_manager.py

@@ -1,8 +1,8 @@
 from types import FunctionType
 from typing import Generator, Optional
 
-from app.core import settings
+from app.core.config import settings
-from app.helper import ModuleHelper
+from app.helper.module import ModuleHelper
 from app.log import logger
 from app.utils.singleton import Singleton
 

app/core/plugin_manager.py

@@ -2,7 +2,7 @@ import traceback
 from typing import List, Any
 
 from app.db.systemconfigs import SystemConfigs
-from app.helper import ModuleHelper
+from app.helper.module import ModuleHelper
 from app.log import logger
 from app.utils.singleton import Singleton
 

app/db/subscribes.py

@@ -2,7 +2,7 @@ from typing import Tuple, List
 
 from sqlalchemy.orm import Session
 
-from app.core import MediaInfo
+from app.core.context import MediaInfo
 from app.db import SessionLocal
 from app.db.models.subscribe import Subscribe
 from app.utils.types import MediaType

app/db/userauth.py

@@ -3,7 +3,8 @@ from fastapi import Depends, HTTPException, status
 from sqlalchemy.orm import Session
 
 from app import schemas
-from app.core import settings, security
+from app.core.config import settings
+from app.core import security
 from app.core.security import reusable_oauth2
 from app.db import get_db
 from app.db.models.user import User

app/helper/__init__.py

@@ -1 +0,0 @@
-from .module import ModuleHelper

app/helper/browser.py

@@ -1,12 +1,14 @@
 from playwright.sync_api import sync_playwright
 
+from app.log import logger
+
 
 class PlaywrightHelper:
     def __init__(self, browser_type="chromium"):
         self.browser_type = browser_type
 
     def get_page_source(self, url: str,
-                        cookie: str = None,
+                        cookies: str = None,
                         ua: str = None,
                         proxy: dict = None,
                         headless: bool = True,
@@ -14,7 +16,7 @@ class PlaywrightHelper:
         """
         获取网页源码
         :param url: 网页地址
-        :param cookie: cookie
+        :param cookies: cookies
         :param ua: user-agent
         :param proxy: 代理
         :param headless: 是否无头模式
@@ -24,11 +26,16 @@ class PlaywrightHelper:
             browser = playwright[self.browser_type].launch(headless=headless)
             context = browser.new_context(user_agent=ua, proxy=proxy)
             page = context.new_page()
-            if cookie:
+            if cookies:
-                page.set_extra_http_headers({"cookie": cookie})
+                page.set_extra_http_headers({"cookie": cookies})
+            try:
                 page.goto(url)
-            page.wait_for_load_state("networkidle", timeout=timeout)
+                page.wait_for_load_state("networkidle", timeout=timeout * 1000)
                 source = page.content()
+            except Exception as e:
+                logger.error(f"获取网页源码失败: {e}")
+                source = None
+            finally:
                 browser.close()
 
         return source
@@ -40,5 +47,5 @@ if __name__ == "__main__":
     test_url = "https://www.baidu.com"
     test_cookies = "cookie1=value1; cookie2=value2"
     test_user_agent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/93.0.4577.63 Safari/537.36"
-    source_code = utils.get_page_source(test_url, cookie=test_cookies, ua=test_user_agent)
+    source_code = utils.get_page_source(test_url, cookies=test_cookies, ua=test_user_agent)
     print(source_code)

app/helper/rss.py

@@ -1,7 +1,7 @@
 import xml.dom.minidom
 from typing import List
 
-from app.core import settings
+from app.core.config import settings
 from app.utils.dom import DomUtils
 from app.utils.http import RequestUtils
 from app.utils.string import StringUtils

app/helper/torrent.py

@@ -6,7 +6,9 @@ from urllib.parse import unquote
 
 from bencode import bdecode
 
-from app.core import settings, Context, MetaInfo
+from app.core.config import settings
+from app.core.context import Context
+from app.core.meta_info import MetaInfo
 from app.log import logger
 from app.utils.http import RequestUtils
 from app.utils.string import StringUtils

app/log.py

@@ -1,7 +1,7 @@
 import logging
 from logging.handlers import RotatingFileHandler
 
-from app.core import settings
+from app.core.config import settings
 
 # logger
 logger = logging.getLogger()

app/main.py

@@ -4,7 +4,9 @@ from uvicorn import Config
 
 from app.api.apiv1 import api_router
 from app.command import Command
-from app.core import settings, ModuleManager, PluginManager
+from app.core.config import settings
+from app.core.module_manager import ModuleManager
+from app.core.plugin_manager import PluginManager
 from app.db.init import init_db, update_db
 from app.helper.sites import SitesHelper
 from app.scheduler import Scheduler

app/modules/douban/__init__.py

@@ -3,7 +3,9 @@ from pathlib import Path
 from typing import List, Optional, Tuple, Union
 from xml.dom import minidom
 
-from app.core import MediaInfo, settings, MetaInfo
+from app.core.context import MediaInfo
+from app.core.config import settings
+from app.core.meta_info import MetaInfo
 from app.core.meta import MetaBase
 from app.log import logger
 from app.modules import _ModuleBase

app/modules/emby/__init__.py

@@ -1,6 +1,6 @@
 from typing import Optional, Tuple, Union
 
-from app.core import MediaInfo
+from app.core.context import MediaInfo
 from app.log import logger
 from app.modules import _ModuleBase
 from app.modules.emby.emby import Emby

app/modules/emby/emby.py

@@ -2,7 +2,7 @@ import re
 from pathlib import Path
 from typing import List, Optional, Union, Dict
 
-from app.core import settings
+from app.core.config import settings
 from app.log import logger
 from app.utils.http import RequestUtils
 from app.utils.singleton import Singleton

app/modules/fanart/__init__.py

@@ -2,7 +2,7 @@ import re
 from functools import lru_cache
 from typing import Optional, Tuple, Union
 
-from app.core import MediaInfo, settings
+from app.core.context import MediaInfo, settings
 from app.log import logger
 from app.modules import _ModuleBase
 from app.utils.http import RequestUtils

app/modules/filetransfer/__init__.py

@@ -5,7 +5,9 @@ from typing import Optional, List, Tuple, Union
 
 from jinja2 import Template
 
-from app.core import MediaInfo, MetaInfo, settings
+from app.core.context import MediaInfo
+from app.core.meta_info import MetaInfo
+from app.core.config import settings
 from app.core.meta import MetaBase
 from app.log import logger
 from app.modules import _ModuleBase

app/modules/filter/__init__.py

@@ -1,7 +1,8 @@
 import re
 from typing import List, Tuple, Union, Dict, Optional
 
-from app.core import TorrentInfo, settings
+from app.core.context import TorrentInfo
+from app.core.config import settings
 from app.modules import _ModuleBase
 from app.modules.filter.RuleParser import RuleParser
 

app/modules/indexer/__init__.py

@@ -4,7 +4,7 @@ from typing import List, Optional, Tuple, Union
 
 from ruamel.yaml import CommentedMap
 
-from app.core import MediaInfo, TorrentInfo
+from app.core.context import MediaInfo, TorrentInfo
 from app.log import logger
 from app.modules import _ModuleBase
 from app.modules.indexer.spider import TorrentSpider

app/modules/indexer/spider.py

@@ -8,8 +8,8 @@ from jinja2 import Template
 from pyquery import PyQuery
 from ruamel.yaml import CommentedMap
 
-from app.core import settings
+from app.core.config import settings
-from app.helper.playwright import PlaywrightHelper
+from app.helper.browser import PlaywrightHelper
 from app.log import logger
 from app.utils.http import RequestUtils
 from app.utils.string import StringUtils
@@ -17,6 +17,7 @@ from app.utils.types import MediaType
 
 
 class TorrentSpider:
+
     # 是否出现错误
     is_error: bool = False
     # 索引器ID
@@ -217,7 +218,7 @@ class TorrentSpider:
         if self.render:
             page_source = PlaywrightHelper().get_page_source(
                 url=searchurl,
-                cookie=self.cookie,
+                cookies=self.cookie,
                 ua=self.ua,
                 proxy=self.proxies
             )

app/modules/indexer/tnode.py

@@ -3,7 +3,7 @@ from typing import Tuple, List
 
 from ruamel.yaml import CommentedMap
 
-from app.core import settings
+from app.core.config import settings
 from app.log import logger
 from app.utils.http import RequestUtils
 from app.utils.string import StringUtils

app/modules/indexer/torrentleech.py

@@ -3,7 +3,7 @@ from urllib.parse import quote
 
 from ruamel.yaml import CommentedMap
 
-from app.core import settings
+from app.core.config import settings
 from app.log import logger
 from app.utils.http import RequestUtils
 from app.utils.string import StringUtils

app/modules/jellyfin/__init__.py

@@ -1,6 +1,6 @@
 from typing import Optional, Tuple, Union
 
-from app.core import MediaInfo
+from app.core.context import MediaInfo
 from app.log import logger
 from app.modules import _ModuleBase
 from app.modules.jellyfin.jellyfin import Jellyfin

app/modules/jellyfin/jellyfin.py

@@ -1,7 +1,7 @@
 import re
 from typing import List, Union, Optional, Dict
 
-from app.core import settings
+from app.core.config import settings
 from app.log import logger
 from app.utils.http import RequestUtils
 from app.utils.singleton import Singleton

app/modules/plex/__init__.py

@@ -1,6 +1,6 @@
 from typing import Optional, Tuple, Union
 
-from app.core import MediaInfo
+from app.core.context import MediaInfo
 from app.log import logger
 from app.modules import _ModuleBase
 from app.modules.plex.plex import Plex

app/modules/plex/plex.py

@@ -5,7 +5,7 @@ from urllib.parse import quote_plus
 from plexapi import media
 from plexapi.server import PlexServer
 
-from app.core import settings
+from app.core.config import settings
 from app.log import logger
 from app.utils.singleton import Singleton
 

app/modules/qbittorrent/__init__.py

@@ -1,7 +1,8 @@
 from pathlib import Path
 from typing import Set, Tuple, Optional, Union, List
 
-from app.core import settings, MetaInfo
+from app.core.config import settings
+from app.core.meta_info import MetaInfo
 from app.modules import _ModuleBase
 from app.modules.qbittorrent.qbittorrent import Qbittorrent
 from app.utils.string import StringUtils

app/modules/qbittorrent/qbittorrent.py

@@ -6,7 +6,7 @@ import qbittorrentapi
 from qbittorrentapi import TorrentFilesList, TorrentDictionary
 from qbittorrentapi.client import Client
 
-from app.core import settings
+from app.core.config import settings
 from app.log import logger
 from app.utils.singleton import Singleton
 from app.utils.string import StringUtils

app/modules/telegram/__init__.py

@@ -1,7 +1,8 @@
 import json
 from typing import Optional, Union, List, Tuple, Any
 
-from app.core import MediaInfo, settings, Context
+from app.core.context import MediaInfo, Context
+from app.core.config import settings
 from app.log import logger
 from app.modules import _ModuleBase
 from app.modules.telegram.telegram import Telegram

app/modules/telegram/telegram.py

@@ -4,11 +4,11 @@ from typing import Optional, List
 
 import telebot
 
-from app.core import settings, MediaInfo, Context
+from app.core.config import settings
+from app.core.context import MediaInfo, Context
 from app.log import logger
 from app.utils.http import RequestUtils
 from app.utils.singleton import Singleton
-from app.utils.string import StringUtils
 
 
 class Telegram(metaclass=Singleton):
@@ -20,6 +20,9 @@ class Telegram(metaclass=Singleton):
         """
         初始化参数
         """
+        if settings.MESSAGER != "telegram":
+            return
+
         # Token
         self._telegram_token = settings.TELEGRAM_TOKEN
         # Chat Id
@@ -72,7 +75,7 @@ class Telegram(metaclass=Singleton):
             else:
                 chat_id = self._telegram_chat_id
 
-            return self.__send_request(image=image, caption=caption)
+            return self.__send_request(userid=chat_id, image=image, caption=caption)
 
         except Exception as msg_e:
             logger.error(f"发送消息失败：{msg_e}")
@@ -110,7 +113,7 @@ class Telegram(metaclass=Singleton):
             else:
                 chat_id = self._telegram_chat_id
 
-            return self.__send_request(image=image, caption=caption)
+            return self.__send_request(userid=chat_id, image=image, caption=caption)
 
         except Exception as msg_e:
             logger.error(f"发送消息失败：{msg_e}")
@@ -140,24 +143,24 @@ class Telegram(metaclass=Singleton):
             else:
                 chat_id = self._telegram_chat_id
 
-            return self.__send_request(caption=caption)
+            return self.__send_request(userid=chat_id, caption=caption)
 
         except Exception as msg_e:
             logger.error(f"发送消息失败：{msg_e}")
             return False
 
-    def __send_request(self, image="", caption="") -> bool:
+    def __send_request(self, userid: str = None, image="", caption="") -> bool:
         """
         向Telegram发送报文
         """
 
         if image:
-            ret = self._bot.send_photo(chat_id=self._telegram_chat_id,
+            ret = self._bot.send_photo(chat_id=userid or self._telegram_chat_id,
                                        photo=image,
                                        caption=caption,
                                        parse_mode="Markdown")
         else:
-            ret = self._bot.send_message(chat_id=self._telegram_chat_id,
+            ret = self._bot.send_message(chat_id=userid or self._telegram_chat_id,
                                          text=caption,
                                          parse_mode="Markdown")
 

app/modules/themoviedb/__init__.py

@@ -3,7 +3,9 @@ from pathlib import Path
 from typing import Optional, List, Tuple, Union
 from xml.dom import minidom
 
-from app.core import settings, MediaInfo, MetaInfo
+from app.core.config import settings
+from app.core.context import MediaInfo
+from app.core.meta_info import MetaInfo
 from app.core.meta import MetaBase
 from app.log import logger
 from app.modules import _ModuleBase

app/modules/themoviedb/category.py

@@ -3,7 +3,7 @@ from pathlib import Path
 
 import ruamel.yaml
 
-from app.core import settings
+from app.core.config import settings
 from app.log import logger
 from app.utils.singleton import Singleton
 

app/modules/themoviedb/tmdb.py

@@ -6,7 +6,7 @@ from lxml import etree
 from tmdbv3api import TMDb, Search, Movie, TV, Season, Episode
 from tmdbv3api.exceptions import TMDbException
 
-from app.core import settings
+from app.core.config import settings
 from app.log import logger
 from app.utils.http import RequestUtils
 from app.utils.string import StringUtils

app/modules/themoviedb/tmdb_cache.py

@@ -5,7 +5,7 @@ from pathlib import Path
 from threading import RLock
 from typing import Optional
 
-from app.core import settings
+from app.core.config import settings
 from app.core.meta import MetaBase
 from app.utils.singleton import Singleton
 from app.utils.types import MediaType

app/modules/transmission/__init__.py

@@ -1,7 +1,8 @@
 from pathlib import Path
 from typing import Set, Tuple, Optional, Union, List
 
-from app.core import settings, MetaInfo
+from app.core.config import settings
+from app.core.meta_info import MetaInfo
 from app.modules import _ModuleBase
 from app.modules.transmission.transmission import Transmission
 from app.utils.types import TorrentStatus

app/modules/transmission/transmission.py

@@ -4,7 +4,7 @@ from typing import Optional, Union, Tuple, List
 import transmission_rpc
 from transmission_rpc import Client, Torrent, File
 
-from app.core import settings
+from app.core.config import settings
 from app.log import logger
 from app.utils.singleton import Singleton
 from app.utils.string import StringUtils

app/modules/wechat/__init__.py

@@ -1,7 +1,8 @@
 import xml.dom.minidom
 from typing import Optional, Union, List, Tuple, Any
 
-from app.core import MediaInfo, settings, Context
+from app.core.context import MediaInfo, Context
+from app.core.config import settings
 from app.log import logger
 from app.modules import _ModuleBase
 from app.modules.wechat.WXBizMsgCrypt3 import WXBizMsgCrypt

app/modules/wechat/wechat.py

@@ -3,7 +3,8 @@ import threading
 from datetime import datetime
 from typing import Optional, List
 
-from app.core import settings, MediaInfo, Context
+from app.core.config import settings
+from app.core.context import MediaInfo, Context
 from app.log import logger
 from app.utils.http import RequestUtils
 from app.utils.singleton import Singleton

app/plugins/__init__.py

@@ -4,7 +4,7 @@ from pathlib import Path
 from typing import Any
 
 from app.chain import ChainBase
-from app.core import settings
+from app.core.config import settings
 from app.db import SessionLocal
 from app.db.models import Base
 from app.db.models.plugin import PluginData

app/plugins/autosignin/__init__.py

@@ -7,8 +7,9 @@ from urllib.parse import urljoin
 from apscheduler.schedulers.background import BackgroundScheduler
 from ruamel.yaml import CommentedMap
 
-from app.core import EventManager, settings, eventmanager
+from app.core.event_manager import EventManager, eventmanager
-from app.helper import ModuleHelper
+from app.core.config import settings
+from app.helper.module import ModuleHelper
 from app.helper.cloudflare import under_challenge
 from app.helper.sites import SitesHelper
 from app.log import logger

app/plugins/autosignin/sites/52pt.py

@@ -4,7 +4,7 @@ from typing import Tuple
 
 from lxml import etree
 
-from app.core import settings
+from app.core.config import settings
 from app.log import logger
 from app.plugins.autosignin.sites import _ISiteSigninHandler
 from app.utils.http import RequestUtils

app/plugins/autosignin/sites/btschool.py

@@ -2,7 +2,7 @@ from typing import Tuple
 
 from ruamel.yaml import CommentedMap
 
-from app.core import settings
+from app.core.config import settings
 from app.log import logger
 from app.plugins.autosignin.sites import _ISiteSigninHandler
 from app.utils.http import RequestUtils

app/plugins/autosignin/sites/chdbits.py

@@ -5,7 +5,7 @@ from typing import Tuple
 from lxml import etree
 from ruamel.yaml import CommentedMap
 
-from app.core import settings
+from app.core.config import settings
 from app.log import logger
 from app.plugins.autosignin.sites import _ISiteSigninHandler
 from app.utils.http import RequestUtils

app/plugins/autosignin/sites/haidan.py

@@ -2,7 +2,7 @@ from typing import Tuple
 
 from ruamel.yaml import CommentedMap
 
-from app.core import settings
+from app.core.config import settings
 from app.log import logger
 from app.plugins.autosignin.sites import _ISiteSigninHandler
 from app.utils.http import RequestUtils

app/plugins/autosignin/sites/hares.py

@@ -3,7 +3,7 @@ from typing import Tuple
 
 from ruamel.yaml import CommentedMap
 
-from app.core import settings
+from app.core.config import settings
 from app.log import logger
 from app.plugins.autosignin.sites import _ISiteSigninHandler
 from app.utils.http import RequestUtils

app/plugins/autosignin/sites/hdarea.py

@@ -2,7 +2,7 @@ from typing import Tuple
 
 from ruamel.yaml import CommentedMap
 
-from app.core import settings
+from app.core.config import settings
 from app.log import logger
 from app.plugins.autosignin.sites import _ISiteSigninHandler
 from app.utils.http import RequestUtils

app/plugins/autosignin/sites/hdchina.py

@@ -4,7 +4,7 @@ from typing import Tuple
 from lxml import etree
 from ruamel.yaml import CommentedMap
 
-from app.core import settings
+from app.core.config import settings
 from app.log import logger
 from app.plugins.autosignin.sites import _ISiteSigninHandler
 from app.utils.http import RequestUtils

app/plugins/autosignin/sites/hdcity.py

@@ -2,7 +2,7 @@ from typing import Tuple
 
 from ruamel.yaml import CommentedMap
 
-from app.core import settings
+from app.core.config import settings
 from app.log import logger
 from app.plugins.autosignin.sites import _ISiteSigninHandler
 from app.utils.http import RequestUtils

app/plugins/autosignin/sites/hdsky.py

@@ -4,7 +4,7 @@ from typing import Tuple
 
 from ruamel.yaml import CommentedMap
 
-from app.core import settings
+from app.core.config import settings
 from app.helper.ocr import OcrHelper
 from app.log import logger
 from app.plugins.autosignin.sites import _ISiteSigninHandler

app/plugins/autosignin/sites/hdupt.py

@@ -3,7 +3,7 @@ from typing import Tuple
 
 from ruamel.yaml import CommentedMap
 
-from app.core import settings
+from app.core.config import settings
 from app.log import logger
 from app.plugins.autosignin.sites import _ISiteSigninHandler
 from app.utils.http import RequestUtils

app/plugins/autosignin/sites/opencd.py

@@ -5,7 +5,7 @@ from typing import Tuple
 from lxml import etree
 from ruamel.yaml import CommentedMap
 
-from app.core import settings
+from app.core.config import settings
 from app.helper.ocr import OcrHelper
 from app.log import logger
 from app.plugins.autosignin.sites import _ISiteSigninHandler

app/plugins/autosignin/sites/pterclub.py

@@ -3,7 +3,7 @@ from typing import Tuple
 
 from ruamel.yaml import CommentedMap
 
-from app.core import settings
+from app.core.config import settings
 from app.log import logger
 from app.plugins.autosignin.sites import _ISiteSigninHandler
 from app.utils.http import RequestUtils

app/plugins/autosignin/sites/tjupt.py

@@ -8,7 +8,7 @@ from PIL import Image
 from lxml import etree
 from ruamel.yaml import CommentedMap
 
-from app.core import settings
+from app.core.config import settings
 from app.log import logger
 from app.plugins.autosignin.sites import _ISiteSigninHandler
 from app.utils.http import RequestUtils

app/plugins/autosignin/sites/ttg.py

@@ -3,7 +3,7 @@ from typing import Tuple
 
 from ruamel.yaml import CommentedMap
 
-from app.core import settings
+from app.core.config import settings
 from app.log import logger
 from app.plugins.autosignin.sites import _ISiteSigninHandler
 from app.utils.http import RequestUtils

app/plugins/autosignin/sites/u2.py

@@ -6,7 +6,7 @@ from typing import Tuple
 from lxml import etree
 from ruamel.yaml import CommentedMap
 
-from app.core import settings
+from app.core.config import settings
 from app.log import logger
 from app.plugins.autosignin.sites import _ISiteSigninHandler
 from app.utils.http import RequestUtils

app/plugins/autosignin/sites/zhuque.py

@@ -4,7 +4,7 @@ from typing import Tuple
 from lxml import etree
 from ruamel.yaml import CommentedMap
 
-from app.core import settings
+from app.core.config import settings
 from app.log import logger
 from app.plugins.autosignin.sites import _ISiteSigninHandler
 from app.utils.http import RequestUtils

app/plugins/sitestatistic/__init__.py

@@ -7,9 +7,10 @@ import requests
 from apscheduler.schedulers.background import BackgroundScheduler
 from ruamel.yaml import CommentedMap
 
-from app.core import settings, eventmanager
+from app.core.config import settings
+from app.core.event_manager import eventmanager
 from app.core.event_manager import Event
-from app.helper import ModuleHelper
+from app.helper.module import ModuleHelper
 from app.helper.sites import SitesHelper
 from app.log import logger
 from app.plugins import _PluginBase

app/plugins/sitestatistic/siteuserinfo/__init__.py

@@ -10,7 +10,7 @@ import requests
 from lxml import etree
 from requests import Session
 
-from app.core import settings
+from app.core.config import settings
 from app.helper.cloudflare import under_challenge
 from app.log import logger
 from app.utils.http import RequestUtils

app/scheduler.py

@@ -9,7 +9,7 @@ from app.chain.cookiecloud import CookieCloudChain
 from app.chain.douban_sync import DoubanSyncChain
 from app.chain.subscribe import SubscribeChain
 from app.chain.transfer import TransferChain
-from app.core import settings
+from app.core.config import settings
 from app.log import logger
 from app.utils.singleton import Singleton
 from app.utils.timer import TimerUtils

tests/test_filter.py

@@ -2,7 +2,7 @@
 
 from unittest import TestCase
 
-from app.core import TorrentInfo
+from app.core.context import TorrentInfo
 from app.modules.filter import FilterModule
 
 

tests/test_metainfo.py

@@ -2,7 +2,7 @@
 
 from unittest import TestCase
 
-from app.core import MetaInfo
+from app.core.meta_info import MetaInfo
 from tests.cases.meta import meta_cases