From 71f7bc7b1b8ea536193691e3bea45e0bb6cd75e2 Mon Sep 17 00:00:00 2001 From: jxxghp Date: Wed, 30 Jul 2025 21:06:55 +0800 Subject: [PATCH] fix --- app/api/endpoints/login.py | 2 +- app/api/endpoints/site.py | 2 +- app/api/endpoints/system.py | 2 +- app/chain/search.py | 2 +- app/chain/site.py | 3 +-- app/chain/torrents.py | 2 +- app/core/plugin.py | 2 +- app/helper/resource.py | 2 +- app/modules/indexer/__init__.py | 2 +- app/scheduler.py | 2 +- app/startup/modules_initializer.py | 2 +- app/utils/web.py | 4 ++-- 12 files changed, 13 insertions(+), 14 deletions(-) diff --git a/app/api/endpoints/login.py b/app/api/endpoints/login.py index cc1ee689..d5a961bc 100644 --- a/app/api/endpoints/login.py +++ b/app/api/endpoints/login.py @@ -8,7 +8,7 @@ from app import schemas from app.chain.user import UserChain from app.core import security from app.core.config import settings -from app.helper.sites import SitesHelper +from app.helper.sites import SitesHelper # noqa from app.helper.wallpaper import WallpaperHelper router = APIRouter() diff --git a/app/api/endpoints/site.py b/app/api/endpoints/site.py index f712c3d3..64851ee0 100644 --- a/app/api/endpoints/site.py +++ b/app/api/endpoints/site.py @@ -22,7 +22,7 @@ from app.db.models.siteuserdata import SiteUserData from app.db.site_oper import SiteOper from app.db.systemconfig_oper import SystemConfigOper from app.db.user_oper import get_current_active_superuser -from app.helper.sites import SitesHelper +from app.helper.sites import SitesHelper # noqa from app.scheduler import Scheduler from app.schemas.types import SystemConfigKey, EventType from app.utils.string import StringUtils diff --git a/app/api/endpoints/system.py b/app/api/endpoints/system.py index 6426410c..fc473787 100644 --- a/app/api/endpoints/system.py +++ b/app/api/endpoints/system.py @@ -10,7 +10,7 @@ from typing import Optional, Union, Annotated import pillow_avif # noqa 用于自动注册AVIF支持 from PIL import Image from aiopath import AsyncPath -from app.helper.sites import SitesHelper # noqa +from app.helper.sites import SitesHelper # noqa # noqa from fastapi import APIRouter, Body, Depends, HTTPException, Header, Request, Response from fastapi.responses import StreamingResponse diff --git a/app/chain/search.py b/app/chain/search.py index 0502e072..e4b32f58 100644 --- a/app/chain/search.py +++ b/app/chain/search.py @@ -13,7 +13,7 @@ from app.core.event import eventmanager, Event from app.core.metainfo import MetaInfo from app.db.systemconfig_oper import SystemConfigOper from app.helper.progress import ProgressHelper -from app.helper.sites import SitesHelper +from app.helper.sites import SitesHelper # noqa from app.helper.torrent import TorrentHelper from app.log import logger from app.schemas import NotExistMediaInfo diff --git a/app/chain/site.py b/app/chain/site.py index 0def3ea8..257564f7 100644 --- a/app/chain/site.py +++ b/app/chain/site.py @@ -1,10 +1,10 @@ import base64 -import gc import re from datetime import datetime from typing import Optional, Tuple, Union, Dict from urllib.parse import urljoin +from app.helper.sites import SitesHelper # noqa from lxml import etree from app.chain import ChainBase @@ -18,7 +18,6 @@ from app.helper.cloudflare import under_challenge from app.helper.cookie import CookieHelper from app.helper.cookiecloud import CookieCloudHelper from app.helper.rss import RssHelper -from app.helper.sites import SitesHelper from app.log import logger from app.schemas import MessageChannel, Notification, SiteUserData from app.schemas.types import EventType, NotificationType diff --git a/app/chain/torrents.py b/app/chain/torrents.py index 2fb894eb..01188a89 100644 --- a/app/chain/torrents.py +++ b/app/chain/torrents.py @@ -10,7 +10,7 @@ from app.core.metainfo import MetaInfo from app.db.site_oper import SiteOper from app.db.systemconfig_oper import SystemConfigOper from app.helper.rss import RssHelper -from app.helper.sites import SitesHelper +from app.helper.sites import SitesHelper # noqa from app.helper.torrent import TorrentHelper from app.log import logger from app.schemas import Notification diff --git a/app/core/plugin.py b/app/core/plugin.py index 29b29852..9a3f4b99 100644 --- a/app/core/plugin.py +++ b/app/core/plugin.py @@ -10,7 +10,7 @@ from concurrent.futures import ThreadPoolExecutor, as_completed from pathlib import Path from typing import Any, Dict, List, Optional, Type, Union, Callable, Tuple -from app.helper.sites import SitesHelper +from app.helper.sites import SitesHelper # noqa from fastapi import HTTPException from starlette import status from watchdog.events import FileSystemEventHandler diff --git a/app/helper/resource.py b/app/helper/resource.py index c5af6632..9f53b253 100644 --- a/app/helper/resource.py +++ b/app/helper/resource.py @@ -2,7 +2,7 @@ import json from pathlib import Path from app.core.config import settings -from app.helper.sites import SitesHelper +from app.helper.sites import SitesHelper # noqa from app.helper.system import SystemHelper from app.log import logger from app.utils.http import RequestUtils diff --git a/app/modules/indexer/__init__.py b/app/modules/indexer/__init__.py index e9ea368e..78527596 100644 --- a/app/modules/indexer/__init__.py +++ b/app/modules/indexer/__init__.py @@ -7,7 +7,7 @@ from app.core.config import settings from app.core.context import TorrentInfo from app.db.site_oper import SiteOper from app.helper.module import ModuleHelper -from app.helper.sites import SitesHelper +from app.helper.sites import SitesHelper # noqa from app.log import logger from app.modules import _ModuleBase from app.modules.indexer.parser import SiteParserBase diff --git a/app/scheduler.py b/app/scheduler.py index aedbd42a..478f36d7 100644 --- a/app/scheduler.py +++ b/app/scheduler.py @@ -21,7 +21,7 @@ from app.core.config import settings from app.core.event import EventManager, eventmanager, Event from app.core.plugin import PluginManager from app.db.systemconfig_oper import SystemConfigOper -from app.helper.sites import SitesHelper +from app.helper.sites import SitesHelper # noqa from app.helper.wallpaper import WallpaperHelper from app.log import logger from app.schemas import Notification, NotificationType, Workflow, ConfigChangeEventData diff --git a/app/startup/modules_initializer.py b/app/startup/modules_initializer.py index 496fd7f7..8f31a3bf 100644 --- a/app/startup/modules_initializer.py +++ b/app/startup/modules_initializer.py @@ -9,7 +9,7 @@ from app.utils.system import SystemUtils # SitesHelper涉及资源包拉取,提前引入并容错提示 try: - from app.helper.sites import SitesHelper + from app.helper.sites import SitesHelper # noqa except ImportError as e: SitesHelper = None error_message = f"错误: {str(e)}\n站点认证及索引相关资源导入失败,请尝试重建容器或手动拉取资源" diff --git a/app/utils/web.py b/app/utils/web.py index 2a0bfff5..a4a30934 100644 --- a/app/utils/web.py +++ b/app/utils/web.py @@ -43,7 +43,7 @@ class WebUtils: return r.json().get("data", {}).get("location") or '' except Exception as err: print(str(err)) - return "" + return "" @staticmethod def get_location2(ip: str): @@ -68,4 +68,4 @@ class WebUtils: return r.json().get("addr") or '' except Exception as err: print(str(err)) - return "" + return ""