diff --git a/app/api/endpoints/login.py b/app/api/endpoints/login.py index 434aa34d..f4791d0a 100644 --- a/app/api/endpoints/login.py +++ b/app/api/endpoints/login.py @@ -10,7 +10,7 @@ from app.core import security from app.core.config import settings from app.db.systemconfig_oper import SystemConfigOper from app.helper.sites import SitesHelper # noqa -from app.helper.graphics import WallpaperHelper +from app.helper.image import WallpaperHelper from app.schemas.types import SystemConfigKey router = APIRouter() diff --git a/app/api/endpoints/system.py b/app/api/endpoints/system.py index baa29ee5..78672c4d 100644 --- a/app/api/endpoints/system.py +++ b/app/api/endpoints/system.py @@ -32,7 +32,7 @@ from app.helper.progress import ProgressHelper from app.helper.rule import RuleHelper from app.helper.subscribe import SubscribeHelper from app.helper.system import SystemHelper -from app.helper.graphics import ImageHelper +from app.helper.image import ImageHelper from app.log import logger from app.scheduler import Scheduler from app.schemas import ConfigChangeEventData diff --git a/app/chain/recommend.py b/app/chain/recommend.py index 1d399132..25bbdb0e 100644 --- a/app/chain/recommend.py +++ b/app/chain/recommend.py @@ -8,7 +8,7 @@ from app.chain.douban import DoubanChain from app.chain.tmdb import TmdbChain from app.core.cache import cached from app.core.config import settings, global_vars -from app.helper.graphics import ImageHelper +from app.helper.image import ImageHelper from app.log import logger from app.schemas import MediaType from app.utils.common import log_execution_time diff --git a/app/helper/directory.py b/app/helper/directory.py index 370f77c4..a3487529 100644 --- a/app/helper/directory.py +++ b/app/helper/directory.py @@ -9,7 +9,7 @@ from app.log import logger from app.schemas.types import SystemConfigKey from app.utils.system import SystemUtils -JINJA2_VAR_PATTERN = re.compile(r"\{\{.*?\}\}", re.DOTALL) +JINJA2_VAR_PATTERN = re.compile(r"\{\{.*?}}", re.DOTALL) class DirectoryHelper: diff --git a/app/helper/graphics.py b/app/helper/image.py similarity index 98% rename from app/helper/graphics.py rename to app/helper/image.py index 63251bba..1fc47102 100644 --- a/app/helper/graphics.py +++ b/app/helper/image.py @@ -199,7 +199,8 @@ class ImageHelper(metaclass=Singleton): logger.warn(f"Invalid image format: {e}") return False - def _get_request_params(self, url: str, proxy: Optional[bool], cookies: Optional[str | dict]) -> dict: + @staticmethod + def _get_request_params(url: str, proxy: Optional[bool], cookies: Optional[str | dict]) -> dict: """获取参数""" referer = "https://movie.douban.com/" if "doubanio.com" in url else None if proxy is None: diff --git a/app/modules/telegram/telegram.py b/app/modules/telegram/telegram.py index 807ddd6a..c7588e95 100644 --- a/app/modules/telegram/telegram.py +++ b/app/modules/telegram/telegram.py @@ -13,7 +13,7 @@ from app.core.config import settings from app.core.context import MediaInfo, Context from app.core.metainfo import MetaInfo from app.helper.thread import ThreadHelper -from app.helper.graphics import ImageHelper +from app.helper.image import ImageHelper from app.log import logger from app.utils.common import retry from app.utils.http import RequestUtils diff --git a/app/scheduler.py b/app/scheduler.py index 1da95e6f..f6729f47 100644 --- a/app/scheduler.py +++ b/app/scheduler.py @@ -27,7 +27,7 @@ from app.core.plugin import PluginManager from app.db.systemconfig_oper import SystemConfigOper from app.helper.message import MessageHelper from app.helper.sites import SitesHelper # noqa -from app.helper.graphics import WallpaperHelper +from app.helper.image import WallpaperHelper from app.log import logger from app.schemas import Notification, NotificationType, Workflow from app.schemas.types import EventType, SystemConfigKey diff --git a/version.py b/version.py index b4a23306..66746438 100644 --- a/version.py +++ b/version.py @@ -1,2 +1,2 @@ -APP_VERSION = 'v2.8.7' -FRONTEND_VERSION = 'v2.8.7' +APP_VERSION = 'v2.8.8' +FRONTEND_VERSION = 'v2.8.8'