v1.8.2

- 新增订阅历史记录功能
- 站点支持显示连接状态
- 站点新增支持花梨月下

注意：更新后需要清理浏览器缓存

.gitignore

@@ -10,7 +10,9 @@ app/helper/*.pyd
 app/helper/*.bin
 app/plugins/**
 !app/plugins/__init__.py
+config/cookies/**
 config/user.db
 config/sites/**
 *.pyc
 *.log
+.vscode

Dockerfile

@@ -33,6 +33,7 @@ RUN apt-get update -y \
         fuse3 \
         rsync \
         ffmpeg \
+        nano \
     && \
     if [ "$(uname -m)" = "x86_64" ]; \
         then ln -s /usr/lib/x86_64-linux-musl/libc.so /lib/libc.musl-x86_64.so.1; \

README.md

@@ -21,7 +21,11 @@
 
 ### 2. **安装CookieCloud服务端（可选）**
 
-MoviePilot内置了公共CookieCloud服务器，如果需要自建服务，可参考 [CookieCloud](https://github.com/easychen/CookieCloud) 项目进行搭建，docker镜像请点击 [这里](https://hub.docker.com/r/easychen/cookiecloud)。
+通过CookieCloud可以快速同步浏览器中保存的站点数据到MoviePilot，支持以下服务方式：
+
+- 使用公共CookieCloud远程服务器（默认）：服务器地址为：https://movie-pilot.org/cookiecloud
+- 使用内建的本地Cookie服务：在 `设定` - `站点` 中打开`启用本地CookieCloud服务器`后，将启用内建的CookieCloud提供服务，服务地址为：`http://localhost:${NGINX_PORT}/cookiecloud/`, Cookie数据加密保存在配置文件目录下的`cookies`文件中
+- 自建服务CookieCloud服务器：参考 [CookieCloud](https://github.com/easychen/CookieCloud) 项目进行搭建，docker镜像请点击 [这里](https://hub.docker.com/r/easychen/cookiecloud)
 
 **声明：** 本项目不会收集用户敏感数据，Cookie同步也是基于CookieCloud项目实现，非本项目提供的能力。技术角度上CookieCloud采用端到端加密，在个人不泄露`用户KEY`和`端对端加密密码`的情况下第三方无法窃取任何用户信息（包括服务器持有者）。如果你不放心，可以不使用公共服务或者不使用本项目，但如果使用后发生了任何信息泄露与本项目无关！
 
@@ -43,7 +47,8 @@ MoviePilot需要配套下载器和媒体服务器配合使用。
 
 - Windows
 
-  下载 [MoviePilot.exe](https://github.com/jxxghp/MoviePilot/releases)，双击运行后自动生成配置文件目录，访问：http://localhost:3000
+  1. 独立执行文件版本：下载 [MoviePilot.exe](https://github.com/jxxghp/MoviePilot/releases)，双击运行后自动生成配置文件目录，访问：http://localhost:3000
+  2. 安装包版本：[Windows-MoviePilot](https://github.com/developer-wlj/Windows-MoviePilot)
 
 - 群晖套件
 
@@ -77,7 +82,7 @@ MoviePilot需要配套下载器和媒体服务器配合使用。
 - **❗AUTH_SITE：** 认证站点（认证通过后才能使用站点相关功能），支持配置多个认证站点，使用`,`分隔，如：`iyuu,hhclub`，会依次执行认证操作，直到有一个站点认证成功。  
 
     配置`AUTH_SITE`后，需要根据下表配置对应站点的认证参数。
-    认证资源`v1.1.4`支持：`iyuu`/`hhclub`/`audiences`/`hddolby`/`zmpt`/`freefarm`/`hdfans`/`wintersakura`/`leaves`/`ptba` /`icc2022`/`ptlsp`/`xingtan`/`ptvicomo`/`agsvpt`/`hdkyl`
+    认证资源`v1.2.4+`支持：`iyuu`/`hhclub`/`audiences`/`hddolby`/`zmpt`/`freefarm`/`hdfans`/`wintersakura`/`leaves`/`ptba` /`icc2022`/`ptlsp`/`xingtan`/`ptvicomo`/`agsvpt`/`hdkyl`/`qingwa`
   
     |      站点      |                          参数                           |
     |:------------:|:-----------------------------------------------------:|
@@ -97,6 +102,7 @@ MoviePilot需要配套下载器和媒体服务器配合使用。
     |   ptvicomo   |     `PTVICOMO_UID`：用户ID<br/>`PTVICOMO_PASSKEY`：密钥     |
     |    agsvpt    |       `AGSVPT_UID`：用户ID<br/>`AGSVPT_PASSKEY`：密钥       |
     |    hdkyl     |        `HDKYL_UID`：用户ID<br/>`HDKYL_PASSKEY`：密钥        |
+    |   qingwa    |      `QINGWA_UID`：用户ID<br/>`QINGWA_PASSKEY`：密钥      |
 
 
 ### 2. **环境变量 / 配置文件**
@@ -106,6 +112,7 @@ MoviePilot需要配套下载器和媒体服务器配合使用。
 - **❗SUPERUSER：** 超级管理员用户名，默认`admin`，安装后使用该用户登录后台管理界面，**注意：启动一次后再次修改该值不会生效，除非删除数据库文件！**
 - **❗API_TOKEN：** API密钥，默认`moviepilot`，在媒体服务器Webhook、微信回调等地址配置中需要加上`?token=`该值，建议修改为复杂字符串
 - **BIG_MEMORY_MODE：** 大内存模式，默认为`false`，开启后会增加缓存数量，占用更多的内存，但响应速度会更快
+- **DOH_ENABLE：** DNS over HTTPS开关，`true`/`false`，默认`true`，开启后会使用DOH对api.themoviedb.org等域名进行解析，以减少被DNS污染的情况，提升网络连通性
 - **META_CACHE_EXPIRE：** 元数据识别缓存过期时间（小时），数字型，不配置或者配置为0时使用系统默认（大内存模式为7天，否则为3天），调大该值可减少themoviedb的访问次数
 - **GITHUB_TOKEN：** Github token，提高自动更新、插件安装等请求Github Api的限流阈值，格式：ghp_****
 - **DEV:** 开发者模式，`true`/`false`，默认`false`，开启后会暂停所有定时任务
@@ -125,6 +132,8 @@ MoviePilot需要配套下载器和媒体服务器配合使用。
 ---
 - **DOWNLOAD_SUBTITLE：** 下载站点字幕，`true`/`false`，默认`true`
 ---
+- **SEARCH_MULTIPLE_NAME：** 搜索时是否使用多个名称搜索，`true`/`false`，默认`false`，开启后会使用多个名称进行搜索，搜索结果会更全面，但会增加搜索时间；关闭时只要其中一个名称搜索到结果或全部名称搜索完毕即停止
+---
 - **MOVIE_RENAME_FORMAT：** 电影重命名格式，基于jinjia2语法
 
   `MOVIE_RENAME_FORMAT`支持的配置项：
@@ -219,6 +228,14 @@ location / {
     proxy_set_header X-Forwarded-Proto $scheme;
 }
 ```
+- 反代使用ssl时，需要开启`http2`，否则会导致日志加载时间过长或不可用。以`Nginx`为例：
+```nginx configuration
+server {
+    listen 443 ssl;
+    http2 on;
+    # ...
+}
+```
 - 新建的企业微信应用需要固定公网IP的代理才能收到消息，代理添加以下代码：
 ```nginx configuration
 location /cgi-bin/gettoken {

app/api/apiv1.py

@@ -1,7 +1,8 @@
 from fastapi import APIRouter
 
 from app.api.endpoints import login, user, site, message, webhook, subscribe, \
-    media, douban, search, plugin, tmdb, history, system, download, dashboard, filebrowser, transfer, mediaserver
+    media, douban, search, plugin, tmdb, history, system, download, dashboard, \
+    filebrowser, transfer, mediaserver, bangumi
 
 api_router = APIRouter()
 api_router.include_router(login.router, prefix="/login", tags=["login"])
@@ -22,3 +23,5 @@ api_router.include_router(dashboard.router, prefix="/dashboard", tags=["dashboar
 api_router.include_router(filebrowser.router, prefix="/filebrowser", tags=["filebrowser"])
 api_router.include_router(transfer.router, prefix="/transfer", tags=["transfer"])
 api_router.include_router(mediaserver.router, prefix="/mediaserver", tags=["mediaserver"])
+api_router.include_router(bangumi.router, prefix="/bangumi", tags=["bangumi"])
+

app/api/endpoints/bangumi.py

@@ -0,0 +1,64 @@
+from typing import List, Any
+
+from fastapi import APIRouter, Depends
+
+from app import schemas
+from app.chain.bangumi import BangumiChain
+from app.core.context import MediaInfo
+from app.core.security import verify_token
+
+router = APIRouter()
+
+
+@router.get("/calendar", summary="Bangumi每日放送", response_model=List[schemas.MediaInfo])
+def calendar(page: int = 1,
+             count: int = 30,
+             _: schemas.TokenPayload = Depends(verify_token)) -> Any:
+    """
+    浏览Bangumi每日放送
+    """
+    infos = BangumiChain().calendar(page=page, count=count)
+    if not infos:
+        return []
+    medias = [MediaInfo(bangumi_info=info) for info in infos]
+    return [media.to_dict() for media in medias]
+
+
+@router.get("/credits/{bangumiid}", summary="查询Bangumi演职员表", response_model=List[schemas.BangumiPerson])
+def bangumi_credits(bangumiid: int,
+                    page: int = 1,
+                    count: int = 20,
+                    _: schemas.TokenPayload = Depends(verify_token)) -> Any:
+    """
+    查询Bangumi演职员表
+    """
+    persons = BangumiChain().bangumi_credits(bangumiid, page=page, count=count)
+    if not persons:
+        return []
+    return [schemas.BangumiPerson(**person) for person in persons]
+
+
+@router.get("/recommend/{bangumiid}", summary="查询Bangumi推荐", response_model=List[schemas.MediaInfo])
+def bangumi_recommend(bangumiid: int,
+                      _: schemas.TokenPayload = Depends(verify_token)) -> Any:
+    """
+    查询Bangumi推荐
+    """
+    infos = BangumiChain().bangumi_recommend(bangumiid)
+    if not infos:
+        return []
+    medias = [MediaInfo(bangumi_info=info) for info in infos]
+    return [media.to_dict() for media in medias]
+
+
+@router.get("/{bangumiid}", summary="查询Bangumi详情", response_model=schemas.MediaInfo)
+def bangumi_info(bangumiid: int,
+                 _: schemas.TokenPayload = Depends(verify_token)) -> Any:
+    """
+    查询Bangumi详情
+    """
+    info = BangumiChain().bangumi_info(bangumiid)
+    if info:
+        return MediaInfo(bangumi_info=info).to_dict()
+    else:
+        return schemas.MediaInfo()

app/api/endpoints/douban.py

@@ -13,7 +13,7 @@ from app.utils.http import RequestUtils
 router = APIRouter()
 
 
-@router.get("/img/{imgurl:path}", summary="豆瓣图片代理")
+@router.get("/img", summary="豆瓣图片代理")
 def douban_img(imgurl: str) -> Any:
     """
     豆瓣图片代理
@@ -90,7 +90,7 @@ def movie_top250(page: int = 1,
     """
     浏览豆瓣剧集信息
     """
-    movies = DoubanChain().movie_top250(page=page, count=count)
+    movies = DoubanChain().movie_top250(page=page, count=count) or []
     return [MediaInfo(douban_info=movie).to_dict() for movie in movies]
 
 
@@ -101,7 +101,7 @@ def tv_weekly_chinese(page: int = 1,
     """
     中国每周剧集口碑榜
     """
-    tvs = DoubanChain().tv_weekly_chinese(page=page, count=count)
+    tvs = DoubanChain().tv_weekly_chinese(page=page, count=count) or []
     return [MediaInfo(douban_info=tv).to_dict() for tv in tvs]
 
 
@@ -112,7 +112,7 @@ def tv_weekly_global(page: int = 1,
     """
     全球每周剧集口碑榜
     """
-    tvs = DoubanChain().tv_weekly_global(page=page, count=count)
+    tvs = DoubanChain().tv_weekly_global(page=page, count=count) or []
     return [MediaInfo(douban_info=tv).to_dict() for tv in tvs]
 
 
@@ -123,7 +123,7 @@ def tv_animation(page: int = 1,
     """
     热门动画剧集
     """
-    tvs = DoubanChain().tv_animation(page=page, count=count)
+    tvs = DoubanChain().tv_animation(page=page, count=count) or []
     return [MediaInfo(douban_info=tv).to_dict() for tv in tvs]
 
 
@@ -134,7 +134,7 @@ def movie_hot(page: int = 1,
     """
     热门电影
     """
-    movies = DoubanChain().movie_hot(page=page, count=count)
+    movies = DoubanChain().movie_hot(page=page, count=count) or []
     return [MediaInfo(douban_info=movie).to_dict() for movie in movies]
 
 
@@ -145,7 +145,7 @@ def tv_hot(page: int = 1,
     """
     热门电视剧
     """
-    tvs = DoubanChain().tv_hot(page=page, count=count)
+    tvs = DoubanChain().tv_hot(page=page, count=count) or []
     return [MediaInfo(douban_info=tv).to_dict() for tv in tvs]
 
 

app/api/endpoints/download.py

@@ -4,6 +4,7 @@ from fastapi import APIRouter, Depends
 
 from app import schemas
 from app.chain.download import DownloadChain
+from app.chain.media import MediaChain
 from app.core.context import MediaInfo, Context, TorrentInfo
 from app.core.metainfo import MetaInfo
 from app.core.security import verify_token
@@ -14,7 +15,7 @@ router = APIRouter()
 
 
 @router.get("/", summary="正在下载", response_model=List[schemas.DownloadingTorrent])
-def read_downloading(
+def read(
         _: schemas.TokenPayload = Depends(verify_token)) -> Any:
     """
     查询正在下载的任务
@@ -23,11 +24,10 @@ def read_downloading(
 
 
 @router.post("/", summary="添加下载", response_model=schemas.Response)
-def add_downloading(
+def download(
         media_in: schemas.MediaInfo,
         torrent_in: schemas.TorrentInfo,
-        current_user: User = Depends(get_current_active_user),
-        _: schemas.TokenPayload = Depends(verify_token)) -> Any:
+        current_user: User = Depends(get_current_active_user)) -> Any:
     """
     添加下载任务
     """
@@ -45,14 +45,42 @@ def add_downloading(
         media_info=mediainfo,
         torrent_info=torrentinfo
     )
-    did = DownloadChain().download_single(context=context, userid=current_user.name, username=current_user.name)
+    did = DownloadChain().download_single(context=context, username=current_user.name)
+    return schemas.Response(success=True if did else False, data={
+        "download_id": did
+    })
+
+
+@router.post("/add", summary="添加下载", response_model=schemas.Response)
+def add(
+        torrent_in: schemas.TorrentInfo,
+        current_user: User = Depends(get_current_active_user)) -> Any:
+    """
+    添加下载任
+    """
+    # 元数据
+    metainfo = MetaInfo(title=torrent_in.title, subtitle=torrent_in.description)
+    # 媒体信息
+    mediainfo = MediaChain().recognize_media(meta=metainfo)
+    if not mediainfo:
+        return schemas.Response(success=False, message="无法识别媒体信息")
+    # 种子信息
+    torrentinfo = TorrentInfo()
+    torrentinfo.from_dict(torrent_in.dict())
+    # 上下文
+    context = Context(
+        meta_info=metainfo,
+        media_info=mediainfo,
+        torrent_info=torrentinfo
+    )
+    did = DownloadChain().download_single(context=context, username=current_user.name)
     return schemas.Response(success=True if did else False, data={
         "download_id": did
     })
 
 
 @router.get("/start/{hashString}", summary="开始任务", response_model=schemas.Response)
-def start_downloading(
+def start(
         hashString: str,
         _: schemas.TokenPayload = Depends(verify_token)) -> Any:
     """
@@ -63,7 +91,7 @@ def start_downloading(
 
 
 @router.get("/stop/{hashString}", summary="暂停任务", response_model=schemas.Response)
-def stop_downloading(
+def stop(
         hashString: str,
         _: schemas.TokenPayload = Depends(verify_token)) -> Any:
     """
@@ -74,7 +102,7 @@ def stop_downloading(
 
 
 @router.delete("/{hashString}", summary="删除下载任务", response_model=schemas.Response)
-def remove_downloading(
+def info(
         hashString: str,
         _: schemas.TokenPayload = Depends(verify_token)) -> Any:
     """

app/api/endpoints/login.py

@@ -1,7 +1,7 @@
 from datetime import timedelta
 from typing import Any
 
-from fastapi import APIRouter, Depends, HTTPException
+from fastapi import APIRouter, Depends, HTTPException, Form
 from fastapi.security import OAuth2PasswordRequestForm
 from sqlalchemy.orm import Session
 
@@ -21,40 +21,41 @@ router = APIRouter()
 
 @router.post("/access-token", summary="获取token", response_model=schemas.Token)
 async def login_access_token(
-        db: Session = Depends(get_db), form_data: OAuth2PasswordRequestForm = Depends()
+    db: Session = Depends(get_db),
+    form_data: OAuth2PasswordRequestForm = Depends(),
+    otp_password: str = Form(None)
 ) -> Any:
     """
     获取认证Token
     """
     # 检查数据库
-    user = User.authenticate(
+    success, user = User.authenticate(
         db=db,
         name=form_data.username,
-        password=form_data.password
+        password=form_data.password,
+        otp_password=otp_password
     )
-    if not user:
-        # 请求协助认证
-        logger.warn(f"登录用户 {form_data.username} 本地用户名或密码不匹配，尝试辅助认证 ...")
-        token = UserChain().user_authenticate(form_data.username, form_data.password)
-        if not token:
-            logger.warn(f"用户 {form_data.username} 登录失败！")
-            raise HTTPException(status_code=401, detail="用户名或密码不正确")
-        else:
-            logger.info(f"用户 {form_data.username} 辅助认证成功，用户信息: {token}，以普通用户登录...")
-            # 加入用户信息表
-            user = User.get_by_name(db=db, name=form_data.username)
-            if not user:
-                logger.info(f"用户不存在，创建用户: {form_data.username}")
+    if not success:
+        # 认证不成功
+        if not user:
+            # 未找到用户，请求协助认证
+            logger.warn(f"登录用户 {form_data.username} 本地不存在，尝试辅助认证 ...")
+            token = UserChain().user_authenticate(form_data.username, form_data.password)
+            if not token:
+                logger.warn(f"用户 {form_data.username} 登录失败！")
+                raise HTTPException(status_code=401, detail="用户名、密码、二次校验码不正确")
+            else:
+                logger.info(f"用户 {form_data.username} 辅助认证成功，用户信息: {token}，以普通用户登录...")
+                # 加入用户信息表
+                logger.info(f"创建用户: {form_data.username}")
                 user = User(name=form_data.username, is_active=True,
                             is_superuser=False, hashed_password=get_password_hash(token))
                 user.create(db)
-            else:
-                # 辅助验证用户若未启用，则禁止登录
-                if not user.is_active:
-                    raise HTTPException(status_code=403, detail="用户未启用")
-                # 普通用户权限
-                user.is_superuser = False
-    elif not user.is_active:
+        else:
+            # 用户存在，但认证失败
+            logger.warn(f"用户 {user.name} 登录失败！")
+            raise HTTPException(status_code=401, detail="用户名、密码或二次校验码不正确")
+    elif user and not user.is_active:
         raise HTTPException(status_code=403, detail="用户未启用")
     logger.info(f"用户 {user.name} 登录成功！")
     return schemas.Token(

app/api/endpoints/media.py

@@ -106,28 +106,17 @@ def media_info(mediaid: str, type_name: str,
     根据媒体ID查询themoviedb或豆瓣媒体信息，type_name: 电影/电视剧
     """
     mtype = MediaType(type_name)
-    tmdbid, doubanid = None, None
+    tmdbid, doubanid, bangumiid = None, None, None
     if mediaid.startswith("tmdb:"):
         tmdbid = int(mediaid[5:])
     elif mediaid.startswith("douban:"):
         doubanid = mediaid[7:]
-    if not tmdbid and not doubanid:
+    elif mediaid.startswith("bangumi:"):
+        bangumiid = int(mediaid[8:])
+    if not tmdbid and not doubanid and not bangumiid:
         return schemas.MediaInfo()
-    if settings.RECOGNIZE_SOURCE == "themoviedb":
-        if not tmdbid and doubanid:
-            tmdbinfo = MediaChain().get_tmdbinfo_by_doubanid(doubanid=doubanid, mtype=mtype)
-            if tmdbinfo:
-                tmdbid = tmdbinfo.get("id")
-            else:
-                return schemas.MediaInfo()
-    else:
-        if not doubanid and tmdbid:
-            doubaninfo = MediaChain().get_doubaninfo_by_tmdbid(tmdbid=tmdbid, mtype=mtype)
-            if doubaninfo:
-                doubanid = doubaninfo.get("id")
-            else:
-                return schemas.MediaInfo()
-    mediainfo = MediaChain().recognize_media(tmdbid=tmdbid, doubanid=doubanid, mtype=mtype)
+    # 识别
+    mediainfo = MediaChain().recognize_media(tmdbid=tmdbid, doubanid=doubanid, bangumiid=bangumiid, mtype=mtype)
     if mediainfo:
         MediaChain().obtain_images(mediainfo)
         return mediainfo.to_dict()

app/api/endpoints/message.py

@@ -2,17 +2,22 @@ from typing import Union, Any, List
 
 from fastapi import APIRouter, BackgroundTasks, Depends
 from fastapi import Request
+from sqlalchemy.orm import Session
 from starlette.responses import PlainTextResponse
 
 from app import schemas
 from app.chain.message import MessageChain
 from app.core.config import settings
 from app.core.security import verify_token
+from app.db import get_db
+from app.db.models import User
+from app.db.models.message import Message
 from app.db.systemconfig_oper import SystemConfigOper
+from app.db.userauth import get_current_active_superuser
 from app.log import logger
 from app.modules.wechat.WXBizMsgCrypt3 import WXBizMsgCrypt
 from app.schemas import NotificationSwitch
-from app.schemas.types import SystemConfigKey, NotificationType
+from app.schemas.types import SystemConfigKey, NotificationType, MessageChannel
 
 router = APIRouter()
 
@@ -36,6 +41,39 @@ async def user_message(background_tasks: BackgroundTasks, request: Request):
     return schemas.Response(success=True)
 
 
+@router.post("/web", summary="接收WEB消息", response_model=schemas.Response)
+def web_message(text: str, current_user: User = Depends(get_current_active_superuser)):
+    """
+    WEB消息响应
+    """
+    MessageChain().handle_message(
+        channel=MessageChannel.Web,
+        userid=current_user.name,
+        username=current_user.name,
+        text=text
+    )
+    return schemas.Response(success=True)
+
+
+@router.get("/web", summary="获取WEB消息", response_model=List[dict])
+def get_web_message(_: schemas.TokenPayload = Depends(verify_token),
+                    db: Session = Depends(get_db),
+                    page: int = 1,
+                    count: int = 20):
+    """
+    获取WEB消息列表
+    """
+    ret_messages = []
+    messages = Message.list_by_page(db, page=page, count=count)
+    for message in messages:
+        try:
+            ret_messages.append(message.to_dict())
+        except Exception as e:
+            logger.error(f"获取WEB消息列表失败: {str(e)}")
+            continue
+    return ret_messages
+
+
 def wechat_verify(echostr: str, msg_signature: str,
                   timestamp: Union[str, int], nonce: str) -> Any:
     """
@@ -103,7 +141,7 @@ def read_switchs(_: schemas.TokenPayload = Depends(verify_token)) -> Any:
 def set_switchs(switchs: List[NotificationSwitch],
                 _: schemas.TokenPayload = Depends(verify_token)) -> Any:
     """
-    查询通知消息渠道开关
+    设置通知消息渠道开关
     """
     switch_list = []
     for switch in switchs:

app/api/endpoints/plugin.py

@@ -14,16 +14,16 @@ router = APIRouter()
 
 
 @router.get("/", summary="所有插件", response_model=List[schemas.Plugin])
-def all_plugins(_: schemas.TokenPayload = Depends(verify_token), state: str = "all") -> Any:
+def all_plugins(_: schemas.TokenPayload = Depends(verify_token), state: str = "all") -> List[schemas.Plugin]:
     """
     查询所有插件清单，包括本地插件和在线插件，插件状态：installed, market, all
     """
     # 本地插件
     local_plugins = PluginManager().get_local_plugins()
     # 已安装插件
-    installed_plugins = [plugin for plugin in local_plugins if plugin.get("installed")]
+    installed_plugins = [plugin for plugin in local_plugins if plugin.installed]
     # 未安装的本地插件
-    not_installed_plugins = [plugin for plugin in local_plugins if not plugin.get("installed")]
+    not_installed_plugins = [plugin for plugin in local_plugins if not plugin.installed]
     if state == "installed":
         return installed_plugins
 
@@ -39,17 +39,17 @@ def all_plugins(_: schemas.TokenPayload = Depends(verify_token), state: str = "a
     # 插件市场插件清单
     market_plugins = []
     # 已安装插件IDS
-    _installed_ids = [plugin["id"] for plugin in installed_plugins]
+    _installed_ids = [plugin.id for plugin in installed_plugins]
     # 未安装的线上插件或者有更新的插件
     for plugin in online_plugins:
-        if plugin["id"] not in _installed_ids:
+        if plugin.id not in _installed_ids:
             market_plugins.append(plugin)
-        elif plugin.get("has_update"):
+        elif plugin.has_update:
             market_plugins.append(plugin)
     # 未安装的本地插件，且不在线上插件中
-    _plugin_ids = [plugin["id"] for plugin in market_plugins]
+    _plugin_ids = [plugin.id for plugin in market_plugins]
     for plugin in not_installed_plugins:
-        if plugin["id"] not in _plugin_ids:
+        if plugin.id not in _plugin_ids:
             market_plugins.append(plugin)
     # 返回插件清单
     if state == "market":
@@ -67,6 +67,14 @@ def installed(_: schemas.TokenPayload = Depends(verify_token)) -> Any:
     return SystemConfigOper().get(SystemConfigKey.UserInstalledPlugins) or []
 
 
+@router.get("/statistic", summary="插件安装统计", response_model=dict)
+def statistic(_: schemas.TokenPayload = Depends(verify_token)) -> Any:
+    """
+    插件安装统计
+    """
+    return PluginHelper().get_statistic()
+
+
 @router.get("/install/{plugin_id}", summary="安装插件", response_model=schemas.Response)
 def install(plugin_id: str,
             repo_url: str = "",
@@ -89,8 +97,8 @@ def install(plugin_id: str,
         install_plugins.append(plugin_id)
         # 保存设置
         SystemConfigOper().set(SystemConfigKey.UserInstalledPlugins, install_plugins)
-    # 重载插件管理器
-    PluginManager().init_config()
+    # 加载插件到内存
+    PluginManager().reload_plugin(plugin_id)
     # 注册插件服务
     Scheduler().update_plugin_job(plugin_id)
     return schemas.Response(success=True)
@@ -125,7 +133,7 @@ def reset_plugin(plugin_id: str, _: schemas.TokenPayload = Depends(verify_token)
     # 删除配置
     PluginManager().delete_plugin_config(plugin_id)
     # 重新生效插件
-    PluginManager().reload_plugin(plugin_id, {})
+    PluginManager().init_plugin(plugin_id, {})
     # 注册插件服务
     Scheduler().update_plugin_job(plugin_id)
     return schemas.Response(success=True)
@@ -148,7 +156,7 @@ def set_plugin_config(plugin_id: str, conf: dict,
     # 保存配置
     PluginManager().save_plugin_config(plugin_id, conf)
     # 重新生效插件
-    PluginManager().reload_plugin(plugin_id, conf)
+    PluginManager().init_plugin(plugin_id, conf)
     # 注册插件服务
     Scheduler().update_plugin_job(plugin_id)
     return schemas.Response(success=True)
@@ -168,8 +176,8 @@ def uninstall_plugin(plugin_id: str,
             break
     # 保存
     SystemConfigOper().set(SystemConfigKey.UserInstalledPlugins, install_plugins)
-    # 重载插件管理器
-    PluginManager().init_config()
+    # 移除插件
+    PluginManager().remove_plugin(plugin_id)
     # 移除插件服务
     Scheduler().remove_plugin_job(plugin_id)
     return schemas.Response(success=True)

app/api/endpoints/search.py

@@ -21,17 +21,19 @@ async def search_latest(_: schemas.TokenPayload = Depends(verify_token)) -> Any:
     return [torrent.to_dict() for torrent in torrents]
 
 
-@router.get("/media/{mediaid}", summary="精确搜索资源", response_model=List[schemas.Context])
+@router.get("/media/{mediaid}", summary="精确搜索资源", response_model=schemas.Response)
 def search_by_id(mediaid: str,
                  mtype: str = None,
                  area: str = "title",
+                 season: str = None,
                  _: schemas.TokenPayload = Depends(verify_token)) -> Any:
     """
-    根据TMDBID/豆瓣ID精确搜索站点资源 tmdb:/douban:/
+    根据TMDBID/豆瓣ID精确搜索站点资源 tmdb:/douban:/bangumi:
     """
-    torrents = []
     if mtype:
         mtype = MediaType(mtype)
+    if season:
+        season = int(season)
     if mediaid.startswith("tmdb:"):
         tmdbid = int(mediaid.replace("tmdb:", ""))
         if settings.RECOGNIZE_SOURCE == "douban":
@@ -39,9 +41,11 @@ def search_by_id(mediaid: str,
             doubaninfo = MediaChain().get_doubaninfo_by_tmdbid(tmdbid=tmdbid, mtype=mtype)
             if doubaninfo:
                 torrents = SearchChain().search_by_id(doubanid=doubaninfo.get("id"),
-                                                      mtype=mtype, area=area)
+                                                      mtype=mtype, area=area, season=season)
+            else:
+                return schemas.Response(success=False, message="未识别到豆瓣媒体信息")
         else:
-            torrents = SearchChain().search_by_id(tmdbid=tmdbid, mtype=mtype, area=area)
+            torrents = SearchChain().search_by_id(tmdbid=tmdbid, mtype=mtype, area=area, season=season)
     elif mediaid.startswith("douban:"):
         doubanid = mediaid.replace("douban:", "")
         if settings.RECOGNIZE_SOURCE == "themoviedb":
@@ -49,12 +53,36 @@ def search_by_id(mediaid: str,
             tmdbinfo = MediaChain().get_tmdbinfo_by_doubanid(doubanid=doubanid, mtype=mtype)
             if tmdbinfo:
                 torrents = SearchChain().search_by_id(tmdbid=tmdbinfo.get("id"),
-                                                      mtype=mtype, area=area)
+                                                      mtype=mtype, area=area, season=season)
+            else:
+                return schemas.Response(success=False, message="未识别到TMDB媒体信息")
         else:
-            torrents = SearchChain().search_by_id(doubanid=doubanid, mtype=mtype, area=area)
+            torrents = SearchChain().search_by_id(doubanid=doubanid, mtype=mtype, area=area, season=season)
+    elif mediaid.startswith("bangumi:"):
+        bangumiid = int(mediaid.replace("bangumi:", ""))
+        if settings.RECOGNIZE_SOURCE == "themoviedb":
+            # 通过BangumiID识别TMDBID
+            tmdbinfo = MediaChain().get_tmdbinfo_by_bangumiid(bangumiid=bangumiid)
+            if tmdbinfo:
+                torrents = SearchChain().search_by_id(tmdbid=tmdbinfo.get("id"),
+                                                      mtype=mtype, area=area, season=season)
+            else:
+                return schemas.Response(success=False, message="未识别到TMDB媒体信息")
+        else:
+            # 通过BangumiID识别豆瓣ID
+            doubaninfo = MediaChain().get_doubaninfo_by_bangumiid(bangumiid=bangumiid)
+            if doubaninfo:
+                torrents = SearchChain().search_by_id(doubanid=doubaninfo.get("id"),
+                                                      mtype=mtype, area=area, season=season)
+            else:
+                return schemas.Response(success=False, message="未识别到豆瓣媒体信息")
     else:
-        return []
-    return [torrent.to_dict() for torrent in torrents]
+        return schemas.Response(success=False, message="未知的媒体ID")
+
+    if not torrents:
+        return schemas.Response(success=False, message="未搜索到任何资源")
+    else:
+        return schemas.Response(success=True, data=[torrent.to_dict() for torrent in torrents])
 
 
 @router.get("/title", summary="模糊搜索资源", response_model=List[schemas.TorrentInfo])

app/api/endpoints/site.py

@@ -12,6 +12,7 @@ from app.core.security import verify_token
 from app.db import get_db
 from app.db.models.site import Site
 from app.db.models.siteicon import SiteIcon
+from app.db.models.sitestatistic import SiteStatistic
 from app.db.systemconfig_oper import SystemConfigOper
 from app.helper.sites import SitesHelper
 from app.scheduler import Scheduler
@@ -42,20 +43,26 @@ def add_site(
     """
     if not site_in.url:
         return schemas.Response(success=False, message="站点地址不能为空")
+    if SitesHelper().auth_level < 2:
+        return schemas.Response(success=False, message="用户未通过认证，无法使用站点功能！")
     domain = StringUtils.get_url_domain(site_in.url)
     site_info = SitesHelper().get_indexer(domain)
     if not site_info:
-        return schemas.Response(success=False, message="该站点不支持或用户未通过认证")
+        return schemas.Response(success=False, message="该站点不支持，请检查站点域名是否正确")
     if Site.get_by_domain(db, domain):
         return schemas.Response(success=False, message=f"{domain} 站点己存在")
     # 保存站点信息
     site_in.domain = domain
+    # 校正地址格式
+    _scheme, _netloc = StringUtils.get_url_netloc(site_in.url)
+    site_in.url = f"{_scheme}://{_netloc}/"
     site_in.name = site_info.get("name")
     site_in.id = None
+    site_in.public = 1 if site_info.get("public") else 0
     site = Site(**site_in.dict())
     site.create(db)
-    # 通知缓存站点图标
-    EventManager().send_event(EventType.CacheSiteIcon, {
+    # 通知站点更新
+    EventManager().send_event(EventType.SiteUpdated, {
         "domain": domain
     })
     return schemas.Response(success=True)
@@ -74,9 +81,12 @@ def update_site(
     site = Site.get(db, site_in.id)
     if not site:
         return schemas.Response(success=False, message="站点不存在")
+    # 校正地址格式
+    _scheme, _netloc = StringUtils.get_url_netloc(site_in.url)
+    site_in.url = f"{_scheme}://{_netloc}/"
     site.update(db, site_in.dict())
-    # 通知缓存站点图标
-    EventManager().send_event(EventType.CacheSiteIcon, {
+    # 通知站点更新
+    EventManager().send_event(EventType.SiteUpdated, {
         "domain": site_in.domain
     })
     return schemas.Response(success=True)
@@ -124,7 +134,7 @@ def reset(db: Session = Depends(get_db),
     # 插件站点删除
     EventManager().send_event(EventType.SiteDeleted,
                               {
-                                  "site_id": None
+                                  "site_id": "*"
                               })
     return schemas.Response(success=True, message="站点已重置！")
 
@@ -231,6 +241,22 @@ def read_site_by_domain(
     return site
 
 
+@router.get("/statistic/{site_url}", summary="站点统计信息", response_model=schemas.SiteStatistic)
+def read_site_by_domain(
+        site_url: str,
+        db: Session = Depends(get_db),
+        _: schemas.TokenPayload = Depends(verify_token)
+) -> Any:
+    """
+    通过域名获取站点统计信息
+    """
+    domain = StringUtils.get_url_domain(site_url)
+    sitestatistic = SiteStatistic.get_by_domain(db, domain)
+    if sitestatistic:
+        return sitestatistic
+    return schemas.SiteStatistic(domain=domain)
+
+
 @router.get("/rss", summary="所有订阅站点", response_model=List[schemas.Site])
 def read_rss_sites(db: Session = Depends(get_db)) -> List[dict]:
     """

app/api/endpoints/subscribe.py

@@ -11,6 +11,7 @@ from app.core.metainfo import MetaInfo
 from app.core.security import verify_token, verify_uri_token
 from app.db import get_db
 from app.db.models.subscribe import Subscribe
+from app.db.models.subscribehistory import SubscribeHistory
 from app.db.models.user import User
 from app.db.userauth import get_current_active_user
 from app.scheduler import Scheduler
@@ -65,7 +66,7 @@ def create_subscribe(
     else:
         mtype = None
     # 豆瓣标理
-    if subscribe_in.doubanid:
+    if subscribe_in.doubanid or subscribe_in.bangumiid:
         meta = MetaInfo(subscribe_in.name)
         subscribe_in.name = meta.name
         subscribe_in.season = meta.begin_season
@@ -80,6 +81,7 @@ def create_subscribe(
                                         tmdbid=subscribe_in.tmdbid,
                                         season=subscribe_in.season,
                                         doubanid=subscribe_in.doubanid,
+                                        bangumiid=subscribe_in.bangumiid,
                                         username=current_user.name,
                                         best_version=subscribe_in.best_version,
                                         save_path=subscribe_in.save_path,
@@ -131,9 +133,10 @@ def subscribe_mediaid(
         db: Session = Depends(get_db),
         _: schemas.TokenPayload = Depends(verify_token)) -> Any:
     """
-    根据TMDBID或豆瓣ID查询订阅 tmdb:/douban:
+    根据 TMDBID/豆瓣ID/BangumiId 查询订阅 tmdb:/douban:
     """
     result = None
+    title_check = False
     if mediaid.startswith("tmdb:"):
         tmdbid = mediaid[5:]
         if not tmdbid or not str(tmdbid).isdigit():
@@ -144,14 +147,21 @@ def subscribe_mediaid(
         if not doubanid:
             return Subscribe()
         result = Subscribe.get_by_doubanid(db, doubanid)
-        # 豆瓣已订阅如果 id 搜索无结果使用标题搜索
-        # 会造成同名结果也会被返回
         if not result and title:
-            meta = MetaInfo(title)
-            if season:
-                meta.begin_season = season
-            result = Subscribe.get_by_title(db, title=meta.name, season=meta.begin_season)
-
+            title_check = True
+    elif mediaid.startswith("bangumi:"):
+        bangumiid = mediaid[8:]
+        if not bangumiid or not str(bangumiid).isdigit():
+            return Subscribe()
+        result = Subscribe.get_by_bangumiid(db, int(bangumiid))
+        if not result and title:
+            title_check = True
+    # 使用名称检查订阅
+    if title_check and title:
+        meta = MetaInfo(title)
+        if season:
+            meta.begin_season = season
+        result = Subscribe.get_by_title(db, title=meta.name, season=meta.begin_season)
     if result and result.sites:
         result.sites = json.loads(result.sites)
 
@@ -188,9 +198,11 @@ def search_subscribes(
     background_tasks.add_task(
         Scheduler().start,
         job_id="subscribe_search",
-        sid=None,
-        state='R',
-        manual=True
+        **{
+            "sid": None,
+            "state": 'R',
+            "manual": True
+        }
     )
     return schemas.Response(success=True)
 
@@ -206,29 +218,15 @@ def search_subscribe(
     background_tasks.add_task(
         Scheduler().start,
         job_id="subscribe_search",
-        sid=subscribe_id,
-        state=None,
-        manual=True
+        **{
+            "sid": subscribe_id,
+            "state": None,
+            "manual": True
+        }
     )
     return schemas.Response(success=True)
 
 
-@router.get("/{subscribe_id}", summary="订阅详情", response_model=schemas.Subscribe)
-def read_subscribe(
-        subscribe_id: int,
-        db: Session = Depends(get_db),
-        _: schemas.TokenPayload = Depends(verify_token)) -> Any:
-    """
-    根据订阅编号查询订阅信息
-    """
-    if not subscribe_id:
-        return Subscribe()
-    subscribe = Subscribe.get(db, subscribe_id)
-    if subscribe and subscribe.sites:
-        subscribe.sites = json.loads(subscribe.sites)
-    return subscribe
-
-
 @router.delete("/media/{mediaid}", summary="删除订阅", response_model=schemas.Response)
 def delete_subscribe_by_mediaid(
         mediaid: str,
@@ -253,19 +251,6 @@ def delete_subscribe_by_mediaid(
     return schemas.Response(success=True)
 
 
-@router.delete("/{subscribe_id}", summary="删除订阅", response_model=schemas.Response)
-def delete_subscribe(
-        subscribe_id: int,
-        db: Session = Depends(get_db),
-        _: schemas.TokenPayload = Depends(verify_token)
-) -> Any:
-    """
-    删除订阅信息
-    """
-    Subscribe.delete(db, subscribe_id)
-    return schemas.Response(success=True)
-
-
 @router.post("/seerr", summary="OverSeerr/JellySeerr通知订阅", response_model=schemas.Response)
 async def seerr_subscribe(request: Request, background_tasks: BackgroundTasks,
                           authorization: str = Header(None)) -> Any:
@@ -317,3 +302,62 @@ async def seerr_subscribe(request: Request, background_tasks: BackgroundTasks,
                                       username=user_name)
 
     return schemas.Response(success=True)
+
+
+@router.get("/history/{mtype}", summary="查询订阅历史", response_model=List[schemas.Subscribe])
+def read_subscribe(
+        mtype: str,
+        page: int = 1,
+        count: int = 30,
+        db: Session = Depends(get_db),
+        _: schemas.TokenPayload = Depends(verify_token)) -> Any:
+    """
+    查询电影/电视剧订阅历史
+    """
+    historys = SubscribeHistory.list_by_type(db, mtype=mtype, page=page, count=count)
+    for history in historys:
+        if history and history.sites:
+            history.sites = json.loads(history.sites)
+    return historys
+
+
+@router.delete("/history/{history_id}", summary="删除订阅历史", response_model=schemas.Response)
+def delete_subscribe(
+        history_id: int,
+        db: Session = Depends(get_db),
+        _: schemas.TokenPayload = Depends(verify_token)
+) -> Any:
+    """
+    删除订阅历史
+    """
+    SubscribeHistory.delete(db, history_id)
+    return schemas.Response(success=True)
+
+
+@router.get("/{subscribe_id}", summary="订阅详情", response_model=schemas.Subscribe)
+def read_subscribe(
+        subscribe_id: int,
+        db: Session = Depends(get_db),
+        _: schemas.TokenPayload = Depends(verify_token)) -> Any:
+    """
+    根据订阅编号查询订阅信息
+    """
+    if not subscribe_id:
+        return Subscribe()
+    subscribe = Subscribe.get(db, subscribe_id)
+    if subscribe and subscribe.sites:
+        subscribe.sites = json.loads(subscribe.sites)
+    return subscribe
+
+
+@router.delete("/{subscribe_id}", summary="删除订阅", response_model=schemas.Response)
+def delete_subscribe(
+        subscribe_id: int,
+        db: Session = Depends(get_db),
+        _: schemas.TokenPayload = Depends(verify_token)
+) -> Any:
+    """
+    删除订阅信息
+    """
+    Subscribe.delete(db, subscribe_id)
+    return schemas.Response(success=True)

app/api/endpoints/system.py

@@ -26,7 +26,7 @@ from version import APP_VERSION
 router = APIRouter()
 
 
-@router.get("/img/{imgurl:path}/{proxy}", summary="图片代理")
+@router.get("/img/{proxy}", summary="图片代理")
 def get_img(imgurl: str, proxy: bool = False) -> Any:
     """
     通过图片代理（使用代理服务器）
@@ -138,7 +138,7 @@ def set_setting(key: str, value: Union[list, dict, bool, int, str] = None,
 
 
 @router.get("/message", summary="实时消息")
-def get_message(token: str):
+def get_message(token: str, role: str = "sys"):
     """
     实时获取系统消息，返回格式为SSE
     """
@@ -152,7 +152,7 @@ def get_message(token: str):
 
     def event_generator():
         while True:
-            detail = message.get()
+            detail = message.get(role)
             yield 'data: %s\n\n' % (detail or '')
             time.sleep(3)
 
@@ -191,6 +191,8 @@ def get_logging(token: str, length: int = 50, logfile: str = "moviepilot.log"):
             return Response(content="日志文件不存在！", media_type="text/plain")
         with open(log_path, 'r', encoding='utf-8') as file:
             text = file.read()
+        # 倒序输出
+        text = '\n'.join(text.split('\n')[::-1])
         return Response(content=text, media_type="text/plain")
     else:
         # 返回SSE流响应

app/api/endpoints/transfer.py

@@ -6,7 +6,7 @@ from sqlalchemy.orm import Session
 
 from app import schemas
 from app.chain.transfer import TransferChain
-from app.core.security import verify_token
+from app.core.security import verify_token, verify_uri_token
 from app.db import get_db
 from app.db.models.transferhistory import TransferHistory
 from app.schemas import MediaType
@@ -105,3 +105,12 @@ def manual_transfer(path: str = None,
         return schemas.Response(success=False, message=errormsg)
     # 成功
     return schemas.Response(success=True)
+
+
+@router.get("/now", summary="立即执行下载器文件整理", response_model=schemas.Response)
+def now(_: str = Depends(verify_uri_token)) -> Any:
+    """
+    立即执行下载器文件整理 API_TOKEN认证（?token=xxx）
+    """
+    TransferChain().process()
+    return schemas.Response(success=True)

app/api/endpoints/user.py

@@ -10,14 +10,15 @@ from app.core.security import get_password_hash
 from app.db import get_db
 from app.db.models.user import User
 from app.db.userauth import get_current_active_superuser, get_current_active_user
+from app.utils.otp import OtpUtils
 
 router = APIRouter()
 
 
 @router.get("/", summary="所有用户", response_model=List[schemas.User])
 def read_users(
-    db: Session = Depends(get_db),
-    current_user: User = Depends(get_current_active_superuser),
+        db: Session = Depends(get_db),
+        current_user: User = Depends(get_current_active_superuser),
 ) -> Any:
     """
     查询用户列表
@@ -28,10 +29,10 @@ def read_users(
 
 @router.post("/", summary="新增用户", response_model=schemas.Response)
 def create_user(
-    *,
-    db: Session = Depends(get_db),
-    user_in: schemas.UserCreate,
-    current_user: User = Depends(get_current_active_superuser),
+        *,
+        db: Session = Depends(get_db),
+        user_in: schemas.UserCreate,
+        current_user: User = Depends(get_current_active_superuser),
 ) -> Any:
     """
     新增用户
@@ -50,10 +51,10 @@ def create_user(
 
 @router.put("/", summary="更新用户", response_model=schemas.Response)
 def update_user(
-    *,
-    db: Session = Depends(get_db),
-    user_in: schemas.UserCreate,
-    _: User = Depends(get_current_active_superuser),
+        *,
+        db: Session = Depends(get_db),
+        user_in: schemas.UserCreate,
+        _: User = Depends(get_current_active_superuser),
 ) -> Any:
     """
     更新用户
@@ -63,7 +64,8 @@ def update_user(
         # 正则表达式匹配密码包含字母、数字、特殊字符中的至少两项
         pattern = r'^(?![a-zA-Z]+$)(?!\d+$)(?![^\da-zA-Z\s]+$).{6,50}$'
         if not re.match(pattern, user_info.get("password")):
-            return schemas.Response(success=False, message="密码需要同时包含字母、数字、特殊字符中的至少两项，且长度大于6位")
+            return schemas.Response(success=False,
+                                    message="密码需要同时包含字母、数字、特殊字符中的至少两项，且长度大于6位")
         user_info["hashed_password"] = get_password_hash(user_info["password"])
         user_info.pop("password")
     user = User.get_by_name(db, name=user_info["name"])
@@ -75,7 +77,7 @@ def update_user(
 
 @router.get("/current", summary="当前登录用户信息", response_model=schemas.User)
 def read_current_user(
-    current_user: User = Depends(get_current_active_user)
+        current_user: User = Depends(get_current_active_user)
 ) -> Any:
     """
     当前登录用户信息
@@ -101,12 +103,51 @@ async def upload_avatar(user_id: int, db: Session = Depends(get_db),
     return schemas.Response(success=True, message=file.filename)
 
 
+@router.post('/otp/generate', summary='生成otp验证uri', response_model=schemas.Response)
+def otp_generate(
+        current_user: User = Depends(get_current_active_user)
+) -> Any:
+    secret, uri = OtpUtils.generate_secret_key(current_user.name)
+    return schemas.Response(success=secret != "", data={'secret': secret, 'uri': uri})
+
+
+@router.post('/otp/judge', summary='判断otp验证是否通过', response_model=schemas.Response)
+def otp_judge(
+        data: dict,
+        db: Session = Depends(get_db),
+        current_user: User = Depends(get_current_active_user)
+) -> Any:
+    uri = data.get("uri")
+    otp_password = data.get("otpPassword")
+    if not OtpUtils.is_legal(uri, otp_password):
+        return schemas.Response(success=False, message="验证码错误")
+    current_user.update_otp_by_name(db, current_user.name, True, OtpUtils.get_secret(uri))
+    return schemas.Response(success=True)
+
+
+@router.post('/otp/disable', summary='关闭当前用户的otp验证', response_model=schemas.Response)
+def otp_disable(
+        db: Session = Depends(get_db),
+        current_user: User = Depends(get_current_active_user)
+) -> Any:
+    current_user.update_otp_by_name(db, current_user.name, False, "")
+    return schemas.Response(success=True)
+
+
+@router.get('/otp/{userid}', summary='判断当前用户是否开启otp验证', response_model=schemas.Response)
+def otp_enable(userid: str, db: Session = Depends(get_db)) -> Any:
+    user: User = User.get_by_name(db, userid)
+    if not user:
+        return schemas.Response(success=False, message="用户不存在")
+    return schemas.Response(success=user.is_otp)
+
+
 @router.delete("/{user_name}", summary="删除用户", response_model=schemas.Response)
 def delete_user(
-    *,
-    db: Session = Depends(get_db),
-    user_name: str,
-    current_user: User = Depends(get_current_active_superuser),
+        *,
+        db: Session = Depends(get_db),
+        user_name: str,
+        current_user: User = Depends(get_current_active_superuser),
 ) -> Any:
     """
     删除用户
@@ -120,9 +161,9 @@ def delete_user(
 
 @router.get("/{user_id}", summary="用户详情", response_model=schemas.User)
 def read_user_by_id(
-    user_id: int,
-    current_user: User = Depends(get_current_active_user),
-    db: Session = Depends(get_db),
+        user_id: int,
+        current_user: User = Depends(get_current_active_user),
+        db: Session = Depends(get_db),
 ) -> Any:
     """
     查询用户详情

app/api/servcookie.py

@@ -0,0 +1,137 @@
+import gzip
+import json
+from hashlib import md5
+from typing import Annotated, Callable
+from typing import Any, Dict, Optional
+
+from fastapi import APIRouter, Depends, HTTPException, Path, Request, Response
+from fastapi.responses import PlainTextResponse
+from fastapi.routing import APIRoute
+
+from app import schemas
+from app.core.config import settings
+from app.log import logger
+from app.utils.common import decrypt
+
+
+class GzipRequest(Request):
+
+    async def body(self) -> bytes:
+        if not hasattr(self, "_body"):
+            body = await super().body()
+            if "gzip" in self.headers.getlist("Content-Encoding"):
+                body = gzip.decompress(body)
+            self._body = body
+        return self._body
+
+
+class GzipRoute(APIRoute):
+
+    def get_route_handler(self) -> Callable:
+        original_route_handler = super().get_route_handler()
+
+        async def custom_route_handler(request: Request) -> Response:
+            request = GzipRequest(request.scope, request.receive)
+            return await original_route_handler(request)
+
+        return custom_route_handler
+
+
+async def verify_server_enabled():
+    """
+    校验CookieCloud服务路由是否打开
+    """
+    if not settings.COOKIECLOUD_ENABLE_LOCAL:
+        raise HTTPException(status_code=400, detail="本地CookieCloud服务器未启用")
+    return True
+
+
+cookie_router = APIRouter(route_class=GzipRoute,
+                          tags=['servcookie'],
+                          dependencies=[Depends(verify_server_enabled)])
+
+
+@cookie_router.get("/", response_class=PlainTextResponse)
+def get_root():
+    return "Hello MoviePilot! COOKIECLOUD API ROOT = /cookiecloud"
+
+
+@cookie_router.post("/", response_class=PlainTextResponse)
+def post_root():
+    return "Hello MoviePilot! COOKIECLOUD API ROOT = /cookiecloud"
+
+
+@cookie_router.post("/update")
+async def update_cookie(req: schemas.CookieData):
+    """
+    上传Cookie数据
+    """
+    file_path = settings.COOKIE_PATH / f"{req.uuid}.json"
+    content = json.dumps({"encrypted": req.encrypted})
+    with open(file_path, encoding="utf-8", mode="w") as file:
+        file.write(content)
+    with open(file_path, encoding="utf-8", mode="r") as file:
+        read_content = file.read()
+    if read_content == content:
+        return {"action": "done"}
+    else:
+        return {"action": "error"}
+
+
+def load_encrypt_data(uuid: str) -> Dict[str, Any]:
+    """
+    加载本地加密原始数据
+    """
+    file_path = settings.COOKIE_PATH / f"{uuid}.json"
+
+    # 检查文件是否存在
+    if not file_path.exists():
+        raise HTTPException(status_code=404, detail="Item not found")
+
+    # 读取文件
+    with open(file_path, encoding="utf-8", mode="r") as file:
+        read_content = file.read()
+    data = json.loads(read_content.encode("utf-8"))
+    return data
+
+
+def get_decrypted_cookie_data(uuid: str, password: str,
+                              encrypted: str) -> Optional[Dict[str, Any]]:
+    """
+    加载本地加密数据并解密为Cookie
+    """
+    key_md5 = md5()
+    key_md5.update((uuid + '-' + password).encode('utf-8'))
+    aes_key = (key_md5.hexdigest()[:16]).encode('utf-8')
+
+    if encrypted:
+        try:
+            decrypted_data = decrypt(encrypted, aes_key).decode('utf-8')
+            decrypted_data = json.loads(decrypted_data)
+            if 'cookie_data' in decrypted_data:
+                return decrypted_data
+        except Exception as e:
+            logger.error(f"解密Cookie数据失败：{str(e)}")
+            return None
+    else:
+        return None
+
+
+@cookie_router.get("/get/{uuid}")
+async def get_cookie(
+        uuid: Annotated[str, Path(min_length=5, pattern="^[a-zA-Z0-9]+$")]):
+    """
+    GET 下载加密数据
+    """
+    return load_encrypt_data(uuid)
+
+
+@cookie_router.post("/get/{uuid}")
+async def post_cookie(
+        uuid: Annotated[str, Path(min_length=5, pattern="^[a-zA-Z0-9]+$")],
+        request: schemas.CookiePassword):
+    """
+    POST 下载加密数据
+    """
+    data = load_encrypt_data(uuid)
+    return get_decrypted_cookie_data(uuid, request.password, data["encrypted"])

app/chain/__init__.py

@@ -15,6 +15,8 @@ from app.core.context import MediaInfo, TorrentInfo
 from app.core.event import EventManager
 from app.core.meta import MetaBase
 from app.core.module import ModuleManager
+from app.db.message_oper import MessageOper
+from app.helper.message import MessageHelper
 from app.log import logger
 from app.schemas import TransferInfo, TransferTorrent, ExistMediaInfo, DownloadingTorrent, CommingMessage, Notification, \
     WebhookEventInfo, TmdbEpisode
@@ -33,6 +35,8 @@ class ChainBase(metaclass=ABCMeta):
         """
         self.modulemanager = ModuleManager()
         self.eventmanager = EventManager()
+        self.messageoper = MessageOper()
+        self.messagehelper = MessageHelper()
 
     @staticmethod
     def load_cache(filename: str) -> Any:
@@ -115,6 +119,7 @@ class ChainBase(metaclass=ABCMeta):
                         mtype: MediaType = None,
                         tmdbid: int = None,
                         doubanid: str = None,
+                        bangumiid: int = None,
                         cache: bool = True) -> Optional[MediaInfo]:
         """
         识别媒体信息
@@ -122,6 +127,7 @@ class ChainBase(metaclass=ABCMeta):
         :param mtype:    识别的媒体类型，与tmdbid配套
         :param tmdbid:   tmdbid
         :param doubanid: 豆瓣ID
+        :param bangumiid: BangumiID
         :param cache:    是否使用缓存
         :return: 识别的媒体信息，包括剧集信息
         """
@@ -132,8 +138,12 @@ class ChainBase(metaclass=ABCMeta):
             tmdbid = meta.tmdbid
         if not doubanid and hasattr(meta, "doubanid"):
             doubanid = meta.doubanid
+        # 有tmdbid时不使用其它ID
+        if tmdbid:
+            doubanid = None
+            bangumiid = None
         return self.run_module("recognize_media", meta=meta, mtype=mtype,
-                               tmdbid=tmdbid, doubanid=doubanid, cache=cache)
+                               tmdbid=tmdbid, doubanid=doubanid, bangumiid=bangumiid, cache=cache)
 
     def match_doubaninfo(self, name: str, imdbid: str = None,
                          mtype: MediaType = None, year: str = None, season: int = None) -> Optional[dict]:
@@ -210,6 +220,14 @@ class ChainBase(metaclass=ABCMeta):
         """
         return self.run_module("tmdb_info", tmdbid=tmdbid, mtype=mtype)
 
+    def bangumi_info(self, bangumiid: int) -> Optional[dict]:
+        """
+        获取Bangumi信息
+        :param bangumiid: int
+        :return: Bangumi信息
+        """
+        return self.run_module("bangumi_info", bangumiid=bangumiid)
+
     def message_parser(self, body: Any, form: Any,
                        args: Any) -> Optional[CommingMessage]:
         """
@@ -403,6 +421,10 @@ class ChainBase(metaclass=ABCMeta):
         :param message:  消息体
         :return: 成功或失败
         """
+        logger.info(f"发送消息：channel={message.channel}，"
+                    f"title={message.title}, "
+                    f"text={message.text}，"
+                    f"userid={message.userid}")
         # 发送事件
         self.eventmanager.send_event(etype=EventType.NoticeMessage,
                                      data={
@@ -413,10 +435,13 @@ class ChainBase(metaclass=ABCMeta):
                                          "image": message.image,
                                          "userid": message.userid,
                                      })
-        logger.info(f"发送消息：channel={message.channel}，"
-                    f"title={message.title}, "
-                    f"text={message.text}，"
-                    f"userid={message.userid}")
+        # 保存消息
+        self.messagehelper.put(message, role="user")
+        self.messageoper.add(channel=message.channel, mtype=message.mtype,
+                             title=message.title, text=message.text,
+                             image=message.image, link=message.link,
+                             userid=message.userid, action=1)
+        # 发送
         self.run_module("post_message", message=message)
 
     def post_medias_message(self, message: Notification, medias: List[MediaInfo]) -> Optional[bool]:
@@ -426,6 +451,13 @@ class ChainBase(metaclass=ABCMeta):
         :param medias:  媒体列表
         :return: 成功或失败
         """
+        note_list = [media.to_dict() for media in medias]
+        self.messagehelper.put(message, role="user", note=note_list)
+        self.messageoper.add(channel=message.channel, mtype=message.mtype,
+                             title=message.title, text=message.text,
+                             image=message.image, link=message.link,
+                             userid=message.userid, action=1,
+                             note=note_list)
         return self.run_module("post_medias_message", message=message, medias=medias)
 
     def post_torrents_message(self, message: Notification, torrents: List[Context]) -> Optional[bool]:
@@ -435,20 +467,28 @@ class ChainBase(metaclass=ABCMeta):
         :param torrents:  种子列表
         :return: 成功或失败
         """
+        note_list = [torrent.torrent_info.to_dict() for torrent in torrents]
+        self.messagehelper.put(message, role="user", note=note_list)
+        self.messageoper.add(channel=message.channel, mtype=message.mtype,
+                             title=message.title, text=message.text,
+                             image=message.image, link=message.link,
+                             userid=message.userid, action=1,
+                             note=note_list)
         return self.run_module("post_torrents_message", message=message, torrents=torrents)
 
     def scrape_metadata(self, path: Path, mediainfo: MediaInfo, transfer_type: str,
-                        force_nfo: bool = False, force_img: bool = False) -> None:
+                        metainfo: MetaBase = None, force_nfo: bool = False, force_img: bool = False) -> None:
         """
         刮削元数据
         :param path: 媒体文件路径
         :param mediainfo:  识别的媒体信息
+        :param metainfo: 源文件的识别元数据
         :param transfer_type:  转移模式
         :param force_nfo:  强制刮削nfo
         :param force_img:  强制刮削图片
         :return: 成功或失败
         """
-        self.run_module("scrape_metadata", path=path, mediainfo=mediainfo,
+        self.run_module("scrape_metadata", path=path, mediainfo=mediainfo, metainfo=metainfo,
                         transfer_type=transfer_type, force_nfo=force_nfo, force_img=force_img)
 
     def register_commands(self, commands: Dict[str, dict]) -> None:

app/chain/bangumi.py

@@ -0,0 +1,42 @@
+from typing import Optional, List
+
+from app.chain import ChainBase
+from app.utils.singleton import Singleton
+
+
+class BangumiChain(ChainBase, metaclass=Singleton):
+    """
+    Bangumi处理链，单例运行
+    """
+
+    def calendar(self, page: int = 1, count: int = 30) -> Optional[List[dict]]:
+        """
+        获取Bangumi每日放送
+        :param page:  页码
+        :param count:  每页数量
+        """
+        return self.run_module("bangumi_calendar", page=page, count=count)
+
+    def bangumi_info(self, bangumiid: int) -> Optional[dict]:
+        """
+        获取Bangumi信息
+        :param bangumiid: BangumiID
+        :return: Bangumi信息
+        """
+        return self.run_module("bangumi_info", bangumiid=bangumiid)
+
+    def bangumi_credits(self, bangumiid: int, page: int = 1, count: int = 20) -> List[dict]:
+        """
+        根据BangumiID查询电影演职员表
+        :param bangumiid:  BangumiID
+        :param page:  页码
+        :param count:  数量
+        """
+        return self.run_module("bangumi_credits", bangumiid=bangumiid, page=page, count=count)
+
+    def bangumi_recommend(self, bangumiid: int) -> List[dict]:
+        """
+        根据BangumiID查询推荐电影
+        :param bangumiid:  BangumiID
+        """
+        return self.run_module("bangumi_recommend", bangumiid=bangumiid)

app/chain/download.py

@@ -34,14 +34,19 @@ class DownloadChain(ChainBase):
         self.mediaserver = MediaServerOper()
 
     def post_download_message(self, meta: MetaBase, mediainfo: MediaInfo, torrent: TorrentInfo,
-                              channel: MessageChannel = None,
-                              userid: str = None):
+                              channel: MessageChannel = None, userid: str = None, username: str = None):
         """
         发送添加下载的消息
+        :param meta: 元数据
+        :param mediainfo: 媒体信息
+        :param torrent: 种子信息
+        :param channel: 通知渠道
+        :param userid: 用户ID，指定时精确发送对应用户
+        :param username: 通知显示的下载用户信息
         """
         msg_text = ""
-        if userid:
-            msg_text = f"用户：{userid}"
+        if username:
+            msg_text = f"用户：{username}"
         if torrent.site_name:
             msg_text = f"{msg_text}\n站点：{torrent.site_name}"
         if meta.resource_term:
@@ -73,6 +78,7 @@ class DownloadChain(ChainBase):
         self.post_message(Notification(
             channel=channel,
             mtype=NotificationType.Download,
+            userid=userid,
             title=f"{mediainfo.title_year} "
                   f"{meta.season_episode} 开始下载",
             text=msg_text,
@@ -103,17 +109,27 @@ class DownloadChain(ChainBase):
                 # 解码参数
                 req_str = base64.b64decode(base64_str.encode('utf-8')).decode('utf-8')
                 req_params: Dict[str, dict] = json.loads(req_str)
+                # 是否使用cookie
+                if not req_params.get('cookie'):
+                    cookie = None
+                # 请求头
+                if req_params.get('header'):
+                    headers = req_params.get('header')
+                else:
+                    headers = None
                 if req_params.get('method') == 'get':
                     # GET请求
                     res = RequestUtils(
                         ua=ua,
-                        cookies=cookie
+                        cookies=cookie,
+                        headers=headers
                     ).get_res(url, params=req_params.get('params'))
                 else:
                     # POST请求
                     res = RequestUtils(
                         ua=ua,
-                        cookies=cookie
+                        cookies=cookie,
+                        headers=headers
                     ).post_res(url, params=req_params.get('params'))
                 if not res:
                     return None
@@ -134,12 +150,15 @@ class DownloadChain(ChainBase):
             return None, "", []
         if torrent.enclosure.startswith("magnet:"):
             return torrent.enclosure, "", []
-
+        # Cookie
+        site_cookie = torrent.site_cookie
         if torrent.enclosure.startswith("["):
             # 需要解码获取下载地址
             torrent_url = __get_redict_url(url=torrent.enclosure,
                                            ua=torrent.site_ua,
-                                           cookie=torrent.site_cookie)
+                                           cookie=site_cookie)
+            # 涉及解析地址的不使用Cookie下载种子，否则MT会出错
+            site_cookie = None
         else:
             torrent_url = torrent.enclosure
         if not torrent_url:
@@ -148,7 +167,7 @@ class DownloadChain(ChainBase):
         # 下载种子文件
         torrent_file, content, download_folder, files, error_msg = self.torrent.download_torrent(
             url=torrent_url,
-            cookie=torrent.site_cookie,
+            cookie=site_cookie,
             ua=torrent.site_ua,
             proxy=torrent.site_proxy)
 
@@ -302,18 +321,20 @@ class DownloadChain(ChainBase):
                 self.downloadhis.add_files(files_to_add)
 
             # 发送消息（群发，不带channel和userid）
-            self.post_download_message(meta=_meta, mediainfo=_media, torrent=_torrent)
+            self.post_download_message(meta=_meta, mediainfo=_media, torrent=_torrent, username=username)
             # 下载成功后处理
             self.download_added(context=context, download_dir=download_dir, torrent_path=torrent_file)
             # 广播事件
             self.eventmanager.send_event(EventType.DownloadAdded, {
                 "hash": _hash,
-                "context": context
+                "context": context,
+                "username": username
             })
         else:
             # 下载失败
             logger.error(f"{_media.title_year} 添加下载任务失败："
                          f"{_torrent.title} - {_torrent.enclosure}，{error_msg}")
+            # 只发送给对应渠道和用户
             self.post_message(Notification(
                 channel=channel,
                 mtype=NotificationType.Manual,

app/chain/media.py

@@ -195,14 +195,11 @@ class MediaChain(ChainBase, metaclass=Singleton):
         doubaninfo = self.douban_info(doubanid=doubanid, mtype=mtype)
         if doubaninfo:
             # 优先使用原标题匹配
-            season_meta = None
             if doubaninfo.get("original_title"):
-                meta = MetaInfo(title=doubaninfo.get("original_title"))
-                season_meta = MetaInfo(title=doubaninfo.get("title"))
-                # 合并季
-                meta.begin_season = season_meta.begin_season
-            else:
                 meta = MetaInfo(title=doubaninfo.get("title"))
+                meta_org = MetaInfo(title=doubaninfo.get("original_title"))
+            else:
+                meta_org = meta = MetaInfo(title=doubaninfo.get("title"))
             # 年份
             if doubaninfo.get("year"):
                 meta.year = doubaninfo.get("year")
@@ -211,24 +208,53 @@ class MediaChain(ChainBase, metaclass=Singleton):
                 meta.type = doubaninfo.get('media_type')
             else:
                 meta.type = MediaType.MOVIE if doubaninfo.get("type") == "movie" else MediaType.TV
-            # 使用原标题识别TMDB媒体信息
-            tmdbinfo = self.match_tmdbinfo(
-                name=meta.name,
-                year=meta.year,
-                mtype=mtype or meta.type,
-                season=meta.begin_season
-            )
-            if not tmdbinfo:
-                if season_meta and season_meta.name != meta.name:
-                    # 使用主标题识别媒体信息
-                    tmdbinfo = self.match_tmdbinfo(
-                        name=season_meta.name,
-                        year=meta.year,
-                        mtype=mtype or meta.type,
-                        season=meta.begin_season
-                    )
+            # 匹配TMDB信息
+            meta_names = list(dict.fromkeys([k for k in [meta_org.name,
+                                                         meta.cn_name,
+                                                         meta.en_name] if k]))
+            for name in meta_names:
+                tmdbinfo = self.match_tmdbinfo(
+                    name=name,
+                    year=meta.year,
+                    mtype=mtype or meta.type,
+                    season=meta.begin_season
+                )
+                if tmdbinfo:
+                    break
         return tmdbinfo
 
+    def get_tmdbinfo_by_bangumiid(self, bangumiid: int) -> Optional[dict]:
+        """
+        根据BangumiID获取TMDB信息
+        """
+        bangumiinfo = self.bangumi_info(bangumiid=bangumiid)
+        if bangumiinfo:
+            # 优先使用原标题匹配
+            if bangumiinfo.get("name_cn"):
+                meta = MetaInfo(title=bangumiinfo.get("name"))
+                meta_cn = MetaInfo(title=bangumiinfo.get("name_cn"))
+            else:
+                meta_cn = meta = MetaInfo(title=bangumiinfo.get("name"))
+            # 年份
+            release_date = bangumiinfo.get("date") or bangumiinfo.get("air_date")
+            if release_date:
+                year = release_date[:4]
+            else:
+                year = None
+            # 识别TMDB媒体信息
+            meta_names = list(dict.fromkeys([k for k in [meta_cn.name,
+                                                         meta.name] if k]))
+            for name in meta_names:
+                tmdbinfo = self.match_tmdbinfo(
+                    name=name,
+                    year=year,
+                    mtype=MediaType.TV,
+                    season=meta.begin_season
+                )
+                if tmdbinfo:
+                    return tmdbinfo
+        return None
+
     def get_doubaninfo_by_tmdbid(self, tmdbid: int,
                                  mtype: MediaType = None, season: int = None) -> Optional[dict]:
         """
@@ -261,3 +287,29 @@ class MediaChain(ChainBase, metaclass=Singleton):
                 imdbid=imdbid
             )
         return None
+
+    def get_doubaninfo_by_bangumiid(self, bangumiid: int) -> Optional[dict]:
+        """
+        根据BangumiID获取豆瓣信息
+        """
+        bangumiinfo = self.bangumi_info(bangumiid=bangumiid)
+        if bangumiinfo:
+            # 优先使用中文标题匹配
+            if bangumiinfo.get("name_cn"):
+                meta = MetaInfo(title=bangumiinfo.get("name_cn"))
+            else:
+                meta = MetaInfo(title=bangumiinfo.get("name"))
+            # 年份
+            release_date = bangumiinfo.get("date") or bangumiinfo.get("air_date")
+            if release_date:
+                year = release_date[:4]
+            else:
+                year = None
+            # 使用名称识别豆瓣媒体信息
+            return self.match_doubaninfo(
+                name=meta.name,
+                year=year,
+                mtype=MediaType.TV,
+                season=meta.begin_season
+            )
+        return None

app/chain/message.py

@@ -12,9 +12,11 @@ from app.core.config import settings
 from app.core.context import MediaInfo, Context
 from app.core.event import EventManager
 from app.core.meta import MetaBase
+from app.db.message_oper import MessageOper
+from app.helper.message import MessageHelper
 from app.helper.torrent import TorrentHelper
 from app.log import logger
-from app.schemas import Notification, NotExistMediaInfo
+from app.schemas import Notification, NotExistMediaInfo, CommingMessage
 from app.schemas.types import EventType, MessageChannel, MediaType
 from app.utils.string import StringUtils
 
@@ -43,6 +45,8 @@ class MessageChain(ChainBase):
         self.mediachain = MediaChain()
         self.eventmanager = EventManager()
         self.torrenthelper = TorrentHelper()
+        self.messagehelper = MessageHelper()
+        self.messageoper = MessageOper()
 
     def __get_noexits_info(
             self,
@@ -100,10 +104,8 @@ class MessageChain(ChainBase):
 
     def process(self, body: Any, form: Any, args: Any) -> None:
         """
-        识别消息内容，执行操作
+        调用模块识别消息内容
         """
-        # 申明全局变量
-        global _current_page, _current_meta, _current_media
         # 获取消息内容
         info = self.message_parser(body=body, form=form, args=args)
         if not info:
@@ -113,7 +115,7 @@ class MessageChain(ChainBase):
         # 用户ID
         userid = info.userid
         # 用户名
-        username = info.username
+        username = info.username or userid
         if not userid:
             logger.debug(f'未识别到用户ID：{body}{form}{args}')
             return
@@ -122,10 +124,34 @@ class MessageChain(ChainBase):
         if not text:
             logger.debug(f'未识别到消息内容：：{body}{form}{args}')
             return
+        # 处理消息
+        self.handle_message(channel=channel, userid=userid, username=username, text=text)
+
+    def handle_message(self, channel: MessageChannel, userid: Union[str, int], username: str, text: str) -> None:
+        """
+        识别消息内容，执行操作
+        """
+        # 申明全局变量
+        global _current_page, _current_meta, _current_media
         # 加载缓存
         user_cache: Dict[str, dict] = self.load_cache(self._cache_file) or {}
         # 处理消息
         logger.info(f'收到用户消息内容，用户：{userid}，内容：{text}')
+        # 保存消息
+        self.messagehelper.put(
+            CommingMessage(
+                userid=userid,
+                username=username,
+                channel=channel,
+                text=text
+            ), role="user")
+        self.messageoper.add(
+            channel=channel,
+            userid=username or userid,
+            text=text,
+            action=0
+        )
+        # 处理消息
         if text.startswith('/'):
             # 执行命令
             self.eventmanager.send_event(
@@ -166,8 +192,8 @@ class MessageChain(ChainBase):
                     # 媒体库中已存在
                     self.post_message(
                         Notification(channel=channel,
-                                     title=f"{_current_media.title_year}"
-                                           f"{_current_meta.sea} 媒体库中已存在，如需重新下载请发送：搜索 XXX 或 下载 XXX",
+                                     title=f"【{_current_media.title_year}"
+                                           f"{_current_meta.sea} 媒体库中已存在，如需重新下载请发送：搜索 名称 或 下载 名称】",
                                      userid=userid))
                     return
                 elif exist_flag:
@@ -248,8 +274,8 @@ class MessageChain(ChainBase):
                     if exist_flag:
                         self.post_message(Notification(
                             channel=channel,
-                            title=f"{mediainfo.title_year}"
-                                  f"{_current_meta.sea} 媒体库中已存在，如需洗版请发送：洗版 XXX",
+                            title=f"【{mediainfo.title_year}"
+                                  f"{_current_meta.sea} 媒体库中已存在，如需洗版请发送：洗版 XXX】",
                             userid=userid))
                         return
                 else:

app/chain/search.py

@@ -1,5 +1,4 @@
 import pickle
-import re
 import traceback
 from concurrent.futures import ThreadPoolExecutor, as_completed
 from datetime import datetime
@@ -9,6 +8,7 @@ from typing import List, Optional
 from app.chain import ChainBase
 from app.core.context import Context
 from app.core.context import MediaInfo, TorrentInfo
+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
@@ -16,8 +16,7 @@ from app.helper.sites import SitesHelper
 from app.helper.torrent import TorrentHelper
 from app.log import logger
 from app.schemas import NotExistMediaInfo
-from app.schemas.types import MediaType, ProgressKey, SystemConfigKey
-from app.utils.string import StringUtils
+from app.schemas.types import MediaType, ProgressKey, SystemConfigKey, EventType
 
 
 class SearchChain(ChainBase):
@@ -33,19 +32,27 @@ class SearchChain(ChainBase):
         self.torrenthelper = TorrentHelper()
 
     def search_by_id(self, tmdbid: int = None, doubanid: str = None,
-                     mtype: MediaType = None, area: str = "title") -> List[Context]:
+                     mtype: MediaType = None, area: str = "title", season: int = None) -> List[Context]:
         """
         根据TMDBID/豆瓣ID搜索资源，精确匹配，但不不过滤本地存在的资源
         :param tmdbid: TMDB ID
         :param doubanid: 豆瓣 ID
         :param mtype: 媒体，电影 or 电视剧
         :param area: 搜索范围，title or imdbid
+        :param season: 季数
         """
         mediainfo = self.recognize_media(tmdbid=tmdbid, doubanid=doubanid, mtype=mtype)
         if not mediainfo:
             logger.error(f'{tmdbid} 媒体信息识别失败！')
             return []
-        results = self.process(mediainfo=mediainfo, area=area)
+        no_exists = None
+        if season:
+            no_exists = {
+                tmdbid or doubanid: {
+                    season: NotExistMediaInfo(episodes=[])
+                }
+            }
+        results = self.process(mediainfo=mediainfo, area=area, no_exists=no_exists)
         # 保存眲结果
         bytes_results = pickle.dumps(results)
         self.systemconfig.set(SystemConfigKey.SearchResults, bytes_results)
@@ -150,13 +157,15 @@ class SearchChain(ChainBase):
         _count = 0
         if mediainfo:
             # 英文标题应该在别名/原标题中，不需要再匹配
-            logger.info(f"标题：{mediainfo.title}，原标题：{mediainfo.original_title}，别名：{mediainfo.names}")
+            logger.info(f"开始匹配结果 标题：{mediainfo.title}，原标题：{mediainfo.original_title}，别名：{mediainfo.names}")
             self.progress.update(value=0, text=f'开始匹配，总 {_total} 个资源 ...', key=ProgressKey.Search)
             for torrent in torrents:
                 _count += 1
                 self.progress.update(value=(_count / _total) * 96,
                                      text=f'正在匹配 {torrent.site_name}，已完成 {_count} / {_total} ...',
                                      key=ProgressKey.Search)
+                if not torrent.title:
+                    continue
                 # 比对IMDBID
                 if torrent.imdbid \
                         and mediainfo.imdb_id \
@@ -166,59 +175,27 @@ class SearchChain(ChainBase):
                     continue
                 # 识别
                 torrent_meta = MetaInfo(title=torrent.title, subtitle=torrent.description)
-                # 比对种子识别类型
-                if torrent_meta.type == MediaType.TV and mediainfo.type != MediaType.TV:
-                    logger.warn(f'{torrent.site_name} - {torrent.title} 种子标题类型为 {torrent_meta.type.value}，'
-                                f'需要是 {mediainfo.type.value}，不匹配')
-                    continue
-                # 比对种子在站点中的类型
-                if torrent.category == MediaType.TV.value and mediainfo.type != MediaType.TV:
-                    logger.warn(f'{torrent.site_name} - {torrent.title} 种子在站点中归类为 {torrent.category}，'
-                                f'需要是 {mediainfo.type.value}，不匹配')
-                    continue
-                # 比对年份
-                if mediainfo.year:
-                    if mediainfo.type == MediaType.TV:
-                        # 剧集年份，每季的年份可能不同
-                        if torrent_meta.year and torrent_meta.year not in [year for year in
-                                                                           mediainfo.season_years.values()]:
-                            logger.warn(f'{torrent.site_name} - {torrent.title} 年份不匹配')
-                            continue
-                    else:
-                        # 电影年份，上下浮动1年
-                        if torrent_meta.year not in [str(int(mediainfo.year) - 1),
-                                                     mediainfo.year,
-                                                     str(int(mediainfo.year) + 1)]:
-                            logger.warn(f'{torrent.site_name} - {torrent.title} 年份不匹配')
-                            continue
-                # 比对标题和原语种标题
-                meta_name = StringUtils.clear_upper(torrent_meta.name)
-                if meta_name in [
-                    StringUtils.clear_upper(mediainfo.title),
-                    StringUtils.clear_upper(mediainfo.original_title)
-                ]:
-                    logger.info(f'{mediainfo.title} 通过标题匹配到资源：{torrent.site_name} - {torrent.title}')
-                    _match_torrents.append(torrent)
-                    continue
-                # 在副标题中判断是否存在标题与原语种标题
-                if torrent.description:
-                    subtitle = re.split(r'[\s/|]+', torrent.description)
-                    if (StringUtils.is_chinese(mediainfo.title)
-                        and str(mediainfo.title) in subtitle) \
-                            or (StringUtils.is_chinese(mediainfo.original_title)
-                                and str(mediainfo.original_title) in subtitle):
-                        logger.info(f'{mediainfo.title} 通过副标题匹配到资源：{torrent.site_name} - {torrent.title}，'
-                                    f'副标题：{torrent.description}')
+                if torrent.title != torrent_meta.org_string:
+                    logger.info(f"种子名称应用识别词后发生改变：{torrent.title} => {torrent_meta.org_string}")
+                # 比对词条指定的tmdbid
+                if torrent_meta.tmdbid or torrent_meta.doubanid:
+                    if torrent_meta.tmdbid and torrent_meta.tmdbid == mediainfo.tmdb_id:
+                        logger.info(f'{mediainfo.title} 通过词表指定TMDBID匹配到资源：{torrent.site_name} - {torrent.title}')
                         _match_torrents.append(torrent)
                         continue
-                # 比对别名和译名
-                for name in mediainfo.names:
-                    if StringUtils.clear_upper(name) == meta_name:
-                        logger.info(f'{mediainfo.title} 通过别名或译名匹配到资源：{torrent.site_name} - {torrent.title}')
+                    if torrent_meta.doubanid and torrent_meta.doubanid == mediainfo.douban_id:
+                        logger.info(f'{mediainfo.title} 通过词表指定豆瓣ID匹配到资源：{torrent.site_name} - {torrent.title}')
                         _match_torrents.append(torrent)
-                        break
-                else:
-                    logger.warn(f'{torrent.site_name} - {torrent.title} 标题不匹配')
+                        continue
+
+                # 比对种子
+                if self.torrenthelper.match_torrent(mediainfo=mediainfo,
+                                                    torrent_meta=torrent_meta,
+                                                    torrent=torrent):
+                    # 匹配成功
+                    _match_torrents.append(torrent)
+                    continue
+            # 匹配完成
             logger.info(f"匹配完成，共匹配到 {len(_match_torrents)} 个资源")
             self.progress.update(value=97,
                                  text=f'匹配完成，共匹配到 {len(_match_torrents)} 个资源',
@@ -233,7 +210,7 @@ class SearchChain(ChainBase):
             # 取搜索优先级规则
             priority_rule = self.systemconfig.get(SystemConfigKey.SearchFilterRules)
         if priority_rule:
-            logger.info(f'开始优先级规则过滤，当前规则：{priority_rule} ...')
+            logger.info(f'开始优先级规则/剧集过滤，当前规则：{priority_rule} ...')
             result: List[TorrentInfo] = self.filter_torrents(rule_string=priority_rule,
                                                              torrent_list=_match_torrents,
                                                              season_episodes=season_episodes,
@@ -244,14 +221,14 @@ class SearchChain(ChainBase):
                 logger.warn(f'{keyword or mediainfo.title} 没有符合优先级规则的资源')
                 return []
         # 使用过滤规则再次过滤
-        if filter_rule:
+        if _match_torrents:
             logger.info(f'开始过滤规则过滤，当前规则：{filter_rule} ...')
             _match_torrents = self.filter_torrents_by_rule(torrents=_match_torrents,
                                                            mediainfo=mediainfo,
                                                            filter_rule=filter_rule)
-            if not _match_torrents:
-                logger.warn(f'{keyword or mediainfo.title} 没有符合过滤规则的资源')
-                return []
+        if not _match_torrents:
+            logger.warn(f'{keyword or mediainfo.title} 没有符合过滤规则的资源')
+            return []
         # 去掉mediainfo中多余的数据
         mediainfo.clear()
         # 组装上下文
@@ -259,8 +236,8 @@ class SearchChain(ChainBase):
                             media_info=mediainfo,
                             torrent_info=torrent) for torrent in _match_torrents]
 
-        logger.info(f"过滤完成，剩余 {_total} 个资源")
-        self.progress.update(value=99, text=f'过滤完成，剩余 {_total} 个资源', key=ProgressKey.Search)
+        logger.info(f"过滤完成，剩余 {len(contexts)} 个资源")
+        self.progress.update(value=99, text=f'过滤完成，剩余 {len(contexts)} 个资源', key=ProgressKey.Search)
         # 排序
         self.progress.update(value=100,
                              text=f'正在对 {len(contexts)} 个资源进行排序，请稍候...',
@@ -384,3 +361,24 @@ class SearchChain(ChainBase):
             ),
             torrents
         ))
+
+    @eventmanager.register(EventType.SiteDeleted)
+    def remove_site(self, event: Event):
+        """
+        从搜索站点中移除与已删除站点相关的设置
+        """
+        if not event:
+            return
+        event_data = event.event_data or {}
+        site_id = event_data.get("site_id")
+        if not site_id:
+            return
+        if site_id == "*":
+            # 清空搜索站点
+            SystemConfigOper().set(SystemConfigKey.IndexerSites, [])
+            return
+        # 从选中的rss站点中移除
+        selected_sites = SystemConfigOper().get(SystemConfigKey.IndexerSites) or []
+        if site_id in selected_sites:
+            selected_sites.remove(site_id)
+            SystemConfigOper().set(SystemConfigKey.IndexerSites, selected_sites)

app/chain/site.py

@@ -1,5 +1,6 @@
 import base64
 import re
+from datetime import datetime
 from typing import Tuple, Optional
 from typing import Union
 from urllib.parse import urljoin
@@ -12,6 +13,8 @@ from app.core.event import eventmanager, Event, EventManager
 from app.db.models.site import Site
 from app.db.site_oper import SiteOper
 from app.db.siteicon_oper import SiteIconOper
+from app.db.systemconfig_oper import SystemConfigOper
+from app.db.sytestatistic_oper import SiteStatisticOper
 from app.helper.browser import PlaywrightHelper
 from app.helper.cloudflare import under_challenge
 from app.helper.cookie import CookieHelper
@@ -40,18 +43,24 @@ class SiteChain(ChainBase):
         self.rsshelper = RssHelper()
         self.cookiehelper = CookieHelper()
         self.message = MessageHelper()
-        self.cookiecloud = CookieCloudHelper(
-            server=settings.COOKIECLOUD_HOST,
-            key=settings.COOKIECLOUD_KEY,
-            password=settings.COOKIECLOUD_PASSWORD
-        )
+        self.cookiecloud = CookieCloudHelper()
+        self.systemconfig = SystemConfigOper()
+        self.sitestatistic = SiteStatisticOper()
 
         # 特殊站点登录验证
         self.special_site_test = {
             "zhuque.in": self.__zhuque_test,
-            # "m-team.io": self.__mteam_test,
+            "m-team.io": self.__mteam_test,
+            "m-team.cc": self.__mteam_test,
+            "ptlsp.com": self.__ptlsp_test,
         }
 
+    def is_special_site(self, domain: str) -> bool:
+        """
+        判断是否特殊站点
+        """
+        return domain in self.special_site_test
+
     @staticmethod
     def __zhuque_test(site: Site) -> Tuple[bool, str]:
         """
@@ -59,8 +68,9 @@ class SiteChain(ChainBase):
         """
         # 获取token
         token = None
+        user_agent = site.ua or settings.USER_AGENT
         res = RequestUtils(
-            ua=site.ua,
+            ua=user_agent,
             cookies=site.cookie,
             proxies=settings.PROXY if site.proxy else None,
             timeout=15
@@ -76,7 +86,7 @@ class SiteChain(ChainBase):
             headers={
                 'X-CSRF-TOKEN': token,
                 "Content-Type": "application/json; charset=utf-8",
-                "User-Agent": f"{site.ua}"
+                "User-Agent": f"{user_agent}"
             },
             cookies=site.cookie,
             proxies=settings.PROXY if site.proxy else None,
@@ -93,9 +103,10 @@ class SiteChain(ChainBase):
         """
         判断站点是否已经登陆：m-team
         """
+        user_agent = site.ua or settings.USER_AGENT
         url = f"{site.url}api/member/profile"
         res = RequestUtils(
-            ua=site.ua,
+            ua=user_agent,
             cookies=site.cookie,
             proxies=settings.PROXY if site.proxy else None,
             timeout=15
@@ -103,9 +114,26 @@ class SiteChain(ChainBase):
         if res and res.status_code == 200:
             user_info = res.json()
             if user_info and user_info.get("data"):
-                return True, "连接成功"
+                # 更新最后访问时间
+                res = RequestUtils(cookies=site.cookie,
+                                   ua=user_agent,
+                                   timeout=60,
+                                   proxies=settings.PROXY if site.proxy else None,
+                                   referer=f"{site.url}index"
+                                   ).post_res(url=urljoin(url, "api/member/updateLastBrowse"))
+                if res:
+                    return True, "连接成功"
+                else:
+                    return True, f"连接成功，但更新状态失败"
         return False, "Cookie已失效"
 
+    def __ptlsp_test(self, site: Site) -> Tuple[bool, str]:
+        """
+        判断站点是否已经登陆：ptlsp
+        """
+        site.url = f"{site.url}index.php"
+        return self.__test(site)
+
     @staticmethod
     def __parse_favicon(url: str, cookie: str, ua: str) -> Tuple[str, Optional[str]]:
         """
@@ -179,7 +207,7 @@ class SiteChain(ChainBase):
                         rss_url, errmsg = self.rsshelper.get_rss_link(
                             url=site_info.url,
                             cookie=cookie,
-                            ua=settings.USER_AGENT,
+                            ua=site_info.ua or settings.USER_AGENT,
                             proxy=True if site_info.proxy else False
                         )
                         if rss_url:
@@ -234,9 +262,9 @@ class SiteChain(ChainBase):
                                   public=1 if indexer.get("public") else 0)
                 _add_count += 1
 
-            # 通知缓存站点图标
+            # 通知站点更新
             if indexer:
-                EventManager().send_event(EventType.CacheSiteIcon, {
+                EventManager().send_event(EventType.SiteUpdated, {
                     "domain": domain,
                 })
         # 处理完成
@@ -248,7 +276,7 @@ class SiteChain(ChainBase):
         logger.info(f"CookieCloud同步成功：{ret_msg}")
         return True, ret_msg
 
-    @eventmanager.register(EventType.CacheSiteIcon)
+    @eventmanager.register(EventType.SiteUpdated)
     def cache_site_icon(self, event: Event):
         """
         缓存站点图标
@@ -290,6 +318,27 @@ class SiteChain(ChainBase):
             else:
                 logger.warn(f"缓存站点 {indexer.get('name')} 图标失败")
 
+    @eventmanager.register(EventType.SiteUpdated)
+    def clear_site_data(self, event: Event):
+        """
+        清理站点数据
+        """
+        if not event:
+            return
+        event_data = event.event_data or {}
+        # 主域名
+        domain = event_data.get("domain")
+        if not domain:
+            return
+        # 获取主域名中间那段
+        domain_host = StringUtils.get_url_host(domain)
+        # 查询以"site.domain_host"开头的配置项，并清除
+        site_keys = self.systemconfig.all().keys()
+        for key in site_keys:
+            if key.startswith(f"site.{domain_host}"):
+                logger.info(f"清理站点配置：{key}")
+                self.systemconfig.delete(key)
+
     def test(self, url: str) -> Tuple[bool, str]:
         """
         测试站点是否可用
@@ -302,53 +351,70 @@ class SiteChain(ChainBase):
         if not site_info:
             return False, f"站点【{url}】不存在"
 
-        # 特殊站点测试
-        if self.special_site_test.get(domain):
-            return self.special_site_test[domain](site_info)
+        # 模拟登录
+        try:
+            # 开始记时
+            start_time = datetime.now()
+            # 特殊站点测试
+            if self.special_site_test.get(domain):
+                state, message = self.special_site_test[domain](site_info)
+            else:
+                # 通用站点测试
+                state, message = self.__test(site_info)
+            # 统计
+            seconds = (datetime.now() - start_time).seconds
+            if state:
+                self.sitestatistic.success(domain=domain, seconds=seconds)
+            else:
+                self.sitestatistic.fail(domain)
+            return state, message
+        except Exception as e:
+            return False, f"{str(e)}！"
 
-        # 通用站点测试
+    @staticmethod
+    def __test(site_info: Site) -> Tuple[bool, str]:
+        """
+        通用站点测试
+        """
         site_url = site_info.url
         site_cookie = site_info.cookie
-        ua = site_info.ua
+        ua = site_info.ua or settings.USER_AGENT
         render = site_info.render
         public = site_info.public
         proxies = settings.PROXY if site_info.proxy else None
         proxy_server = settings.PROXY_SERVER if site_info.proxy else None
-        # 模拟登录
-        try:
-            # 访问链接
-            if render:
-                page_source = PlaywrightHelper().get_page_source(url=site_url,
-                                                                 cookies=site_cookie,
-                                                                 ua=ua,
-                                                                 proxies=proxy_server)
-                if not public and not SiteUtils.is_logged_in(page_source):
-                    if under_challenge(page_source):
-                        return False, f"无法通过Cloudflare！"
-                    return False, f"仿真登录失败，Cookie已失效！"
-            else:
-                res = RequestUtils(cookies=site_cookie,
-                                   ua=ua,
-                                   proxies=proxies
-                                   ).get_res(url=site_url)
-                # 判断登录状态
-                if res and res.status_code in [200, 500, 403]:
-                    if not public and not SiteUtils.is_logged_in(res.text):
-                        if under_challenge(res.text):
-                            msg = "站点被Cloudflare防护，请打开站点浏览器仿真"
-                        elif res.status_code == 200:
-                            msg = "Cookie已失效"
-                        else:
-                            msg = f"状态码：{res.status_code}"
-                        return False, f"{msg}！"
-                    elif public and res.status_code != 200:
-                        return False, f"状态码：{res.status_code}！"
-                elif res is not None:
+
+        # 访问链接
+        if render:
+            page_source = PlaywrightHelper().get_page_source(url=site_url,
+                                                             cookies=site_cookie,
+                                                             ua=ua,
+                                                             proxies=proxy_server)
+            if not public and not SiteUtils.is_logged_in(page_source):
+                if under_challenge(page_source):
+                    return False, f"无法通过Cloudflare！"
+                return False, f"仿真登录失败，Cookie已失效！"
+        else:
+            res = RequestUtils(cookies=site_cookie,
+                               ua=ua,
+                               proxies=proxies
+                               ).get_res(url=site_url)
+            # 判断登录状态
+            if res and res.status_code in [200, 500, 403]:
+                if not public and not SiteUtils.is_logged_in(res.text):
+                    if under_challenge(res.text):
+                        msg = "站点被Cloudflare防护，请打开站点浏览器仿真"
+                    elif res.status_code == 200:
+                        msg = "Cookie已失效"
+                    else:
+                        msg = f"状态码：{res.status_code}"
+                    return False, f"{msg}！"
+                elif public and res.status_code != 200:
                     return False, f"状态码：{res.status_code}！"
-                else:
-                    return False, f"无法打开网站！"
-        except Exception as e:
-            return False, f"{str(e)}！"
+            elif res is not None:
+                return False, f"状态码：{res.status_code}！"
+            else:
+                return False, f"无法打开网站！"
         return True, "连接成功"
 
     def remote_list(self, channel: MessageChannel, userid: Union[str, int] = None):

app/chain/subscribe.py

@@ -1,6 +1,5 @@
 import json
 import random
-import re
 import time
 from datetime import datetime
 from typing import Dict, List, Optional, Union, Tuple
@@ -12,17 +11,18 @@ from app.chain.search import SearchChain
 from app.chain.torrents import TorrentsChain
 from app.core.config import settings
 from app.core.context import TorrentInfo, Context, MediaInfo
+from app.core.event import eventmanager, Event, EventManager
 from app.core.meta import MetaBase
 from app.core.metainfo import MetaInfo
 from app.db.models.subscribe import Subscribe
 from app.db.subscribe_oper import SubscribeOper
+from app.db.subscribehistory_oper import SubscribeHistoryOper
 from app.db.systemconfig_oper import SystemConfigOper
 from app.helper.message import MessageHelper
 from app.helper.torrent import TorrentHelper
 from app.log import logger
 from app.schemas import NotExistMediaInfo, Notification
-from app.schemas.types import MediaType, SystemConfigKey, MessageChannel, NotificationType
-from app.utils.string import StringUtils
+from app.schemas.types import MediaType, SystemConfigKey, MessageChannel, NotificationType, EventType
 
 
 class SubscribeChain(ChainBase):
@@ -35,6 +35,7 @@ class SubscribeChain(ChainBase):
         self.downloadchain = DownloadChain()
         self.searchchain = SearchChain()
         self.subscribeoper = SubscribeOper()
+        self.subscribehistoryoper = SubscribeHistoryOper()
         self.torrentschain = TorrentsChain()
         self.mediachain = MediaChain()
         self.message = MessageHelper()
@@ -45,6 +46,7 @@ class SubscribeChain(ChainBase):
             mtype: MediaType = None,
             tmdbid: int = None,
             doubanid: str = None,
+            bangumiid: int = None,
             season: int = None,
             channel: MessageChannel = None,
             userid: str = None,
@@ -100,6 +102,7 @@ class SubscribeChain(ChainBase):
                     mediainfo = self.recognize_media(mtype=mediainfo.type,
                                                      tmdbid=mediainfo.tmdb_id,
                                                      doubanid=mediainfo.douban_id,
+                                                     bangumiid=mediainfo.bangumi_id,
                                                      cache=False)
                     if not mediainfo:
                         logger.error(f"媒体信息识别失败！")
@@ -124,8 +127,21 @@ class SubscribeChain(ChainBase):
         # 合并信息
         if doubanid:
             mediainfo.douban_id = doubanid
+        if bangumiid:
+            mediainfo.bangumi_id = bangumiid
         # 添加订阅
-        sid, err_msg = self.subscribeoper.add(mediainfo, season=season, username=username, **kwargs)
+        kwargs.update({
+            'quality': self.__get_default_subscribe_config(mediainfo.type, "quality"),
+            'resolution': self.__get_default_subscribe_config(mediainfo.type, "resolution"),
+            'effect': self.__get_default_subscribe_config(mediainfo.type, "effect"),
+            'include': self.__get_default_subscribe_config(mediainfo.type, "include"),
+            'exclude': self.__get_default_subscribe_config(mediainfo.type, "exclude"),
+            'best_version': self.__get_default_subscribe_config(mediainfo.type, "best_version"),
+            'search_imdbid': self.__get_default_subscribe_config(mediainfo.type, "search_imdbid"),
+            'sites': self.__get_default_subscribe_config(mediainfo.type, "sites") or None,
+            'save_path': self.__get_default_subscribe_config(mediainfo.type, "save_path"),
+        })
+        sid, err_msg = self.subscribeoper.add(mediainfo=mediainfo, season=season, username=username, **kwargs)
         if not sid:
             logger.error(f'{mediainfo.title_year} {err_msg}')
             if not exist_ok and message:
@@ -139,8 +155,8 @@ class SubscribeChain(ChainBase):
                                                userid=userid))
         elif message:
             logger.info(f'{mediainfo.title_year} {metainfo.season} 添加订阅成功')
-            if username or userid:
-                text = f"评分：{mediainfo.vote_average}，来自用户：{username or userid}"
+            if username:
+                text = f"评分：{mediainfo.vote_average}，来自用户：{username}"
             else:
                 text = f"评分：{mediainfo.vote_average}"
             # 群发
@@ -148,6 +164,12 @@ class SubscribeChain(ChainBase):
                                            title=f"{mediainfo.title_year} {metainfo.season} 已添加订阅",
                                            text=text,
                                            image=mediainfo.get_message_image()))
+            # 发送事件
+            EventManager().send_event(EventType.SubscribeAdded, {
+                "subscribe_id": sid,
+                "username": username,
+                "mediainfo": mediainfo.to_dict(),
+            })
         # 返回结果
         return sid, ""
 
@@ -351,11 +373,19 @@ class SubscribeChain(ChainBase):
         priority = max([item.torrent_info.pri_order for item in downloads])
         if priority == 100:
             logger.info(f'{mediainfo.title_year} 洗版完成，删除订阅')
+            # 新增订阅历史
+            self.subscribehistoryoper.add(**subscribe.to_dict())
+            # 删除订阅
             self.subscribeoper.delete(subscribe.id)
             # 发送通知
             self.post_message(Notification(mtype=NotificationType.Subscribe,
                                            title=f'{mediainfo.title_year} {meta.season} 已洗版完成',
                                            image=mediainfo.get_message_image()))
+            # 发送事件
+            EventManager().send_event(EventType.SubscribeComplete, {
+                "subscribe_id": subscribe.id,
+                "mediainfo": mediainfo.to_dict(),
+            })
         else:
             # 正在洗版，更新资源优先级
             logger.info(f'{mediainfo.title_year} 正在洗版，更新资源优先级为 {priority}')
@@ -381,11 +411,19 @@ class SubscribeChain(ChainBase):
                     or force):
                 # 全部下载完成
                 logger.info(f'{mediainfo.title_year} 完成订阅')
+                # 新增订阅历史
+                self.subscribehistoryoper.add(**subscribe.to_dict())
+                # 删除订阅
                 self.subscribeoper.delete(subscribe.id)
                 # 发送通知
                 self.post_message(Notification(mtype=NotificationType.Subscribe,
                                                title=f'{mediainfo.title_year} {meta.season} 已完成订阅',
                                                image=mediainfo.get_message_image()))
+                # 发送事件
+                EventManager().send_event(EventType.SubscribeComplete, {
+                    "subscribe_id": subscribe.id,
+                    "mediainfo": mediainfo.to_dict(),
+                })
             elif downloads and meta.type == MediaType.TV:
                 # 电视剧更新已下载集数
                 self.__update_subscribe_note(subscribe=subscribe, downloads=downloads)
@@ -557,9 +595,9 @@ class SubscribeChain(ChainBase):
                     torrent_meta = context.meta_info
                     torrent_mediainfo = context.media_info
                     torrent_info = context.torrent_info
-
                     # 如果识别了媒体信息，则比对TMDBID和类型
                     if torrent_mediainfo.tmdb_id or torrent_mediainfo.douban_id:
+                        # 直接比对媒体信息
                         if torrent_mediainfo.type != mediainfo.type:
                             continue
                         if torrent_mediainfo.tmdb_id \
@@ -568,56 +606,25 @@ class SubscribeChain(ChainBase):
                         if torrent_mediainfo.douban_id \
                                 and torrent_mediainfo.douban_id != mediainfo.douban_id:
                             continue
-                        logger.info(f'{mediainfo.title_year} 通过媒体信ID匹配到资源：{torrent_info.site_name} - {torrent_info.title}')
+                        logger.info(
+                            f'{mediainfo.title_year} 通过媒体信ID匹配到资源：{torrent_info.site_name} - {torrent_info.title}')
                     else:
-                        # 按标题匹配
-                        # 比对种子识别类型
-                        if torrent_meta.type == MediaType.TV and mediainfo.type != MediaType.TV:
-                            continue
-                        # 比对种子在站点中的类型
-                        if torrent_info.category == MediaType.TV.value and mediainfo.type != MediaType.TV:
-                            continue
-                        # 比对年份
-                        if mediainfo.year:
-                            if mediainfo.type == MediaType.TV:
-                                # 剧集年份，每季的年份可能不同
-                                if torrent_meta.year and torrent_meta.year not in [year for year in
-                                                                                   mediainfo.season_years.values()]:
-                                    continue
-                            else:
-                                # 电影年份，上下浮动1年
-                                if torrent_meta.year not in [str(int(mediainfo.year) - 1),
-                                                             mediainfo.year,
-                                                             str(int(mediainfo.year) + 1)]:
-                                    continue
-                        # 标题匹配标志
-                        title_match = False
-                        # 比对标题和原语种标题
-                        meta_name = StringUtils.clear_upper(torrent_meta.name)
-                        if meta_name in [
-                            StringUtils.clear_upper(mediainfo.title),
-                            StringUtils.clear_upper(mediainfo.original_title)
-                        ]:
-                            title_match = True
-                        # 在副标题中判断是否存在标题与原语种标题
-                        if not title_match and torrent_info.description:
-                            subtitle = re.split(r'[\s/|]+', torrent_info.description)
-                            if (StringUtils.is_chinese(mediainfo.title)
-                                and str(mediainfo.title) in subtitle) \
-                                    or (StringUtils.is_chinese(mediainfo.original_title)
-                                        and str(mediainfo.original_title) in subtitle):
-                                title_match = True
-                        # 比对别名和译名
-                        if not title_match:
-                            for name in mediainfo.names:
-                                if StringUtils.clear_upper(name) == meta_name:
-                                    title_match = True
-                                    break
-                        if not title_match:
-                            continue
-                        # 标题匹配成功
-                        logger.info(f'{mediainfo.title_year} 通过名称匹配到资源：{torrent_info.site_name} - {torrent_info.title}')
-
+                        # 没有torrent_mediainfo媒体信息，按标题匹配
+                        manual_match = False
+                        # 比对词条指定的tmdbid
+                        if torrent_meta.tmdbid or torrent_meta.doubanid:
+                            if torrent_meta.tmdbid and torrent_meta.tmdbid != mediainfo.tmdb_id:
+                                continue
+                            if torrent_meta.doubanid and torrent_meta.doubanid != mediainfo.douban_id:
+                                continue
+                            manual_match = True
+                        if not manual_match:
+                            # 没有指定tmdbid，按标题匹配
+                            if not self.torrenthelper.match_torrent(mediainfo=mediainfo,
+                                                                    torrent_meta=torrent_meta,
+                                                                    torrent=torrent_info,
+                                                                    logerror=False):
+                                continue
                     # 优先级过滤规则
                     if subscribe.best_version:
                         priority_rule = self.systemconfig.get(SystemConfigKey.BestVersionFilterRules)
@@ -952,3 +959,62 @@ class SubscribeChain(ChainBase):
                     start_episode=start_episode
                 )
         return no_exists
+
+    @eventmanager.register(EventType.SiteDeleted)
+    def remove_site(self, event: Event):
+        """
+        从订阅中移除与站点相关的设置
+        """
+        if not event:
+            return
+        event_data = event.event_data or {}
+        site_id = event_data.get("site_id")
+        if not site_id:
+            return
+        if site_id == "*":
+            # 站点被重置
+            SystemConfigOper().set(SystemConfigKey.RssSites, [])
+            for subscribe in self.subscribeoper.list():
+                if not subscribe.sites:
+                    continue
+                self.subscribeoper.update(subscribe.id, {
+                    "sites": ""
+                })
+            return
+        # 从选中的rss站点中移除
+        selected_sites = SystemConfigOper().get(SystemConfigKey.RssSites) or []
+        if site_id in selected_sites:
+            selected_sites.remove(site_id)
+            SystemConfigOper().set(SystemConfigKey.RssSites, selected_sites)
+        # 查询所有订阅
+        for subscribe in self.subscribeoper.list():
+            if not subscribe.sites:
+                continue
+            sites = json.loads(subscribe.sites) or []
+            if site_id not in sites:
+                continue
+            sites.remove(site_id)
+            self.subscribeoper.update(subscribe.id, {
+                "sites": json.dumps(sites)
+            })
+
+    @staticmethod
+    def __get_default_subscribe_config(mtype: MediaType, default_config_key: str):
+        """
+        获取默认订阅配置
+        """
+        default_subscribe_key = None
+        if mtype == MediaType.TV:
+            default_subscribe_key = "DefaultTvSubscribeConfig"
+        if mtype == MediaType.MOVIE:
+            default_subscribe_key = "DefaultMovieSubscribeConfig"
+
+        # 默认订阅规则
+        if hasattr(settings, default_subscribe_key):
+            value = getattr(settings, default_subscribe_key)
+        else:
+            value = SystemConfigOper().get(default_subscribe_key)
+
+        if not value:
+            return None
+        return value.get(default_config_key) or None

app/chain/torrents.py

@@ -184,6 +184,8 @@ class TorrentsChain(ChainBase, metaclass=Singleton):
                     logger.info(f'处理资源：{torrent.title} ...')
                     # 识别
                     meta = MetaInfo(title=torrent.title, subtitle=torrent.description)
+                    if torrent.title != meta.org_string:
+                        logger.info(f'种子名称应用识别词后发生改变：{torrent.title} => {meta.org_string}')
                     # 使用站点种子分类，校正类型识别
                     if meta.type != MediaType.TV \
                             and torrent.category == MediaType.TV.value:
@@ -191,7 +193,7 @@ class TorrentsChain(ChainBase, metaclass=Singleton):
                     # 识别媒体信息
                     mediainfo: MediaInfo = self.mediachain.recognize_by_meta(meta)
                     if not mediainfo:
-                        logger.warn(f'未识别到媒体信息，标题：{torrent.title}')
+                        logger.warn(f'{torrent.title} 未识别到媒体信息')
                         # 存储空的媒体信息
                         mediainfo = MediaInfo()
                     # 清理多余数据

app/chain/transfer.py

@@ -278,8 +278,13 @@ class TransferChain(ChainBase):
 
                 # 获取集数据
                 if file_mediainfo.type == MediaType.TV:
-                    episodes_info = self.tmdbchain.tmdb_episodes(tmdbid=file_mediainfo.tmdb_id,
-                                                                 season=file_meta.begin_season or 1)
+                    if file_meta.begin_season is None:
+                        file_meta.begin_season = 1
+                    file_mediainfo.season = file_mediainfo.season or file_meta.begin_season
+                    episodes_info = self.tmdbchain.tmdb_episodes(
+                        tmdbid=file_mediainfo.tmdb_id,
+                        season=file_mediainfo.season
+                    )
                 else:
                     episodes_info = None
 
@@ -355,7 +360,8 @@ class TransferChain(ChainBase):
                 if settings.SCRAP_METADATA:
                     self.scrape_metadata(path=transferinfo.target_path,
                                          mediainfo=file_mediainfo,
-                                         transfer_type=transfer_type)
+                                         transfer_type=transfer_type,
+                                         metainfo=file_meta)
                 # 更新进度
                 processed_num += 1
                 self.progress.update(value=processed_num / total_num * 100,

app/core/config.py

@@ -66,7 +66,7 @@ class Settings(BaseSettings):
                           '.rmvb', '.avi', '.mov', '.mpeg',
                           '.mpg', '.wmv', '.3gp', '.asf',
                           '.m4v', '.flv', '.m2ts', '.strm',
-                          '.tp']
+                          '.tp', '.f4v']
     # 支持的字幕文件后缀格式
     RMT_SUBEXT: list = ['.srt', '.ass', '.ssa', '.sup']
     # 下载器临时文件后缀
@@ -187,6 +187,8 @@ class Settings(BaseSettings):
     PLEX_TOKEN: Optional[str] = None
     # 转移方式 link/copy/move/softlink
     TRANSFER_TYPE: str = "copy"
+    # CookieCloud是否启动本地服务
+    COOKIECLOUD_ENABLE_LOCAL: Optional[bool] = False
     # CookieCloud服务器地址
     COOKIECLOUD_HOST: str = "https://movie-pilot.org/cookiecloud"
     # CookieCloud用户KEY
@@ -232,6 +234,10 @@ class Settings(BaseSettings):
     AUTO_UPDATE_RESOURCE: bool = True
     # 元数据识别缓存过期时间（小时）
     META_CACHE_EXPIRE: int = 0
+    # 是否启用DOH解析域名
+    DOH_ENABLE: bool = True
+    # 搜索多个名称
+    SEARCH_MULTIPLE_NAME: bool = False
 
     @validator("SUBSCRIBE_RSS_INTERVAL",
                "COOKIECLOUD_INTERVAL",
@@ -275,6 +281,10 @@ class Settings(BaseSettings):
     @property
     def LOG_PATH(self):
         return self.CONFIG_PATH / "logs"
+    
+    @property
+    def COOKIE_PATH(self):
+        return self.CONFIG_PATH / "cookies"
 
     @property
     def CACHE_CONF(self):
@@ -397,6 +407,9 @@ class Settings(BaseSettings):
         with self.LOG_PATH as p:
             if not p.exists():
                 p.mkdir(parents=True, exist_ok=True)
+        with self.COOKIE_PATH as p:
+            if not p.exists():
+                p.mkdir(parents=True, exist_ok=True)
 
     class Config:
         case_sensitive = True

app/core/context.py

@@ -153,6 +153,8 @@ class MediaInfo:
     tvdb_id: int = None
     # 豆瓣ID
     douban_id: str = None
+    # Bangumi ID
+    bangumi_id: int = None
     # 媒体原语种
     original_language: str = None
     # 媒体原发行标题
@@ -185,6 +187,8 @@ class MediaInfo:
     tmdb_info: dict = field(default_factory=dict)
     # 豆瓣 INFO
     douban_info: dict = field(default_factory=dict)
+    # Bangumi INFO
+    bangumi_info: dict = field(default_factory=dict)
     # 导演
     directors: List[dict] = field(default_factory=list)
     # 演员
@@ -240,6 +244,8 @@ class MediaInfo:
             self.set_tmdb_info(self.tmdb_info)
         if self.douban_info:
             self.set_douban_info(self.douban_info)
+        if self.bangumi_info:
+            self.set_bangumi_info(self.bangumi_info)
 
     def __setattr__(self, name: str, value: Any):
         self.__dict__[name] = value
@@ -487,7 +493,8 @@ class MediaInfo:
                         self.release_date = match.group()
         # 海报
         if not self.poster_path:
-            self.poster_path = info.get("pic", {}).get("large")
+            if info.get("pic"):
+                self.poster_path = info.get("pic", {}).get("large")
             if not self.poster_path and info.get("cover_url"):
                 self.poster_path = info.get("cover_url")
             if not self.poster_path and info.get("cover"):
@@ -540,6 +547,70 @@ class MediaInfo:
             if not hasattr(self, key):
                 setattr(self, key, value)
 
+    def set_bangumi_info(self, info: dict):
+        """
+        初始化Bangumi信息
+        """
+        if not info:
+            return
+        # 本体
+        self.bangumi_info = info
+        # 豆瓣ID
+        self.bangumi_id = info.get("id")
+        # 类型
+        if not self.type:
+            self.type = MediaType.TV
+        # 标题
+        if not self.title:
+            self.title = info.get("name_cn") or info.get("name")
+        # 原语种标题
+        if not self.original_title:
+            self.original_title = info.get("name")
+        # 识别标题中的季
+        meta = MetaInfo(self.title)
+        # 季
+        if not self.season:
+            self.season = meta.begin_season
+        # 评分
+        if not self.vote_average:
+            rating = info.get("rating")
+            if rating:
+                vote_average = float(rating.get("score"))
+            else:
+                vote_average = 0
+            self.vote_average = vote_average
+        # 发行日期
+        if not self.release_date:
+            self.release_date = info.get("date") or info.get("air_date")
+            # 年份
+            if not self.year:
+                self.year = self.release_date[:4] if self.release_date else None
+        # 海报
+        if not self.poster_path:
+            if info.get("images"):
+                self.poster_path = info.get("images", {}).get("large")
+        # 简介
+        if not self.overview:
+            self.overview = info.get("summary")
+        # 别名
+        if not self.names:
+            infobox = info.get("infobox")
+            if infobox:
+                akas = [item.get("value") for item in infobox if item.get("key") == "别名"]
+                if akas:
+                    self.names = [aka.get("v") for aka in akas[0]]
+
+        # 剧集
+        if self.type == MediaType.TV and not self.seasons:
+            meta = MetaInfo(self.title)
+            season = meta.begin_season or 1
+            episodes_count = info.get("total_episodes")
+            if episodes_count:
+                self.seasons[season] = list(range(1, episodes_count + 1))
+        # 演员
+        if not self.actors:
+            self.actors = info.get("actors") or []
+
     @property
     def title_year(self):
         if self.title:
@@ -558,6 +629,8 @@ class MediaInfo:
                 return "https://www.themoviedb.org/tv/%s" % self.tmdb_id
         elif self.douban_id:
             return "https://movie.douban.com/subject/%s" % self.douban_id
+        elif self.bangumi_id:
+            return "http://bgm.tv/subject/%s" % self.bangumi_id
         return ""
 
     @property
@@ -619,6 +692,9 @@ class MediaInfo:
         dicts["type"] = self.type.value if self.type else None
         dicts["detail_link"] = self.detail_link
         dicts["title_year"] = self.title_year
+        dicts["tmdb_info"] = None
+        dicts["douban_info"] = None
+        dicts["bangumi_info"] = None
         return dicts
 
     def clear(self):
@@ -627,6 +703,7 @@ class MediaInfo:
         """
         self.tmdb_info = {}
         self.douban_info = {}
+        self.bangumi_info = {}
         self.seasons = {}
         self.genres = []
         self.season_info = []

app/core/meta/metaanime.py

@@ -16,7 +16,7 @@ class MetaAnime(MetaBase):
     识别动漫
     """
     _anime_no_words = ['CHS&CHT', 'MP4', 'GB MP4', 'WEB-DL']
-    _name_nostring_re = r"S\d{2}\s*-\s*S\d{2}|S\d{2}|\s+S\d{1,2}|EP?\d{2,4}\s*-\s*EP?\d{2,4}|EP?\d{2,4}|\s+EP?\d{1,4}"
+    _name_nostring_re = r"S\d{2}\s*-\s*S\d{2}|S\d{2}|\s+S\d{1,2}|EP?\d{2,4}\s*-\s*EP?\d{2,4}|EP?\d{2,4}|\s+EP?\d{1,4}|\s+GB"
 
     def __init__(self, title: str, subtitle: str = None, isfile: bool = False):
         super().__init__(title, subtitle, isfile)
@@ -32,8 +32,6 @@ class MetaAnime(MetaBase):
             if anitopy_info:
                 # 名称
                 name = anitopy_info.get("anime_title")
-                if name and name.find("/") != -1:
-                    name = name.split("/")[-1].strip()
                 if not name or name in self._anime_no_words or (len(name) < 5 and not StringUtils.is_chinese(name)):
                     anitopy_info = anitopy.parse("[ANIME]" + title)
                     if anitopy_info:
@@ -44,23 +42,41 @@ class MetaAnime(MetaBase):
                         name = name_match.group(1).strip()
                 # 拆份中英文名称
                 if name:
-                    lastword_type = ""
-                    for word in name.split():
-                        if not word:
-                            continue
-                        if word.endswith(']'):
-                            word = word[:-1]
-                        if word.isdigit():
-                            if lastword_type == "cn":
-                                self.cn_name = "%s %s" % (self.cn_name or "", word)
-                            elif lastword_type == "en":
-                                self.en_name = "%s %s" % (self.en_name or "", word)
-                        elif StringUtils.is_chinese(word):
-                            self.cn_name = "%s %s" % (self.cn_name or "", word)
-                            lastword_type = "cn"
+                    _split_flag = True
+                    # 按/拆分中英文
+                    if name.find("/") != -1:
+                        names = name.split("/")
+                        if StringUtils.is_chinese(names[0]):
+                            self.cn_name = names[0]
+                            if len(names) > 1:
+                                self.en_name = names[1]
+                            _split_flag = False
+                        elif StringUtils.is_chinese(names[-1]):
+                            self.cn_name = names[-1]
+                            if len(names) > 1:
+                                self.en_name = names[0]
+                            _split_flag = False
                         else:
-                            self.en_name = "%s %s" % (self.en_name or "", word)
-                            lastword_type = "en"
+                            name = names[-1]
+                    # 拆分中英文
+                    if _split_flag:
+                        lastword_type = ""
+                        for word in name.split():
+                            if not word:
+                                continue
+                            if word.endswith(']'):
+                                word = word[:-1]
+                            if word.isdigit():
+                                if lastword_type == "cn":
+                                    self.cn_name = "%s %s" % (self.cn_name or "", word)
+                                elif lastword_type == "en":
+                                    self.en_name = "%s %s" % (self.en_name or "", word)
+                            elif StringUtils.is_chinese(word):
+                                self.cn_name = "%s %s" % (self.cn_name or "", word)
+                                lastword_type = "cn"
+                            else:
+                                self.en_name = "%s %s" % (self.en_name or "", word)
+                                lastword_type = "en"
                 if self.cn_name:
                     _, self.cn_name, _, _, _, _ = StringUtils.get_keyword(self.cn_name)
                     if self.cn_name:

app/core/meta/metabase.py

@@ -67,16 +67,18 @@ class MetaBase(object):
 
     # 副标题解析
     _subtitle_flag = False
+    _title_episodel_re = r"Episode\s+(\d{1,4})"
     _subtitle_season_re = r"(?<![全共]\s*)[第\s]+([0-9一二三四五六七八九十S\-]+)\s*季(?!\s*[全共])"
     _subtitle_season_all_re = r"[全共]\s*([0-9一二三四五六七八九十]+)\s*季|([0-9一二三四五六七八九十]+)\s*季\s*全"
-    _subtitle_episode_re = r"(?<![全共]\s*)[第\s]+([0-9一二三四五六七八九十百零EP\-]+)\s*[集话話期](?!\s*[全共])"
-    _subtitle_episode_all_re = r"([0-9一二三四五六七八九十百零]+)\s*集\s*全|[全共]\s*([0-9一二三四五六七八九十百零]+)\s*[集话話期]"
+    _subtitle_episode_re = r"(?<![全共]\s*)[第\s]+([0-9一二三四五六七八九十百零EP]+)\s*[集话話期幕](?!\s*[全共])"
+    _subtitle_episode_between_re = r"[第]*\s*([0-9一二三四五六七八九十百零]+)\s*[集话話期幕]?\s*-\s*第*\s*([0-9一二三四五六七八九十百零]+)\s*[集话話期幕]"
+    _subtitle_episode_all_re = r"([0-9一二三四五六七八九十百零]+)\s*集\s*全|[全共]\s*([0-9一二三四五六七八九十百零]+)\s*[集话話期幕]"
 
     def __init__(self, title: str, subtitle: str = None, isfile: bool = False):
         if not title:
             return
-        self.org_string = title
-        self.subtitle = subtitle
+        self.org_string = title.strip() if title else None
+        self.subtitle = subtitle.strip() if subtitle else None
         self.isfile = isfile
 
     @property
@@ -110,7 +112,39 @@ class MetaBase(object):
         if not title_text:
             return
         title_text = f" {title_text} "
-        if re.search(r'[全第季集话話期]', title_text, re.IGNORECASE):
+        if re.search(r"%s" % self._title_episodel_re, title_text, re.IGNORECASE):
+            episode_str = re.search(r'%s' % self._title_episodel_re, title_text, re.IGNORECASE)
+            if episode_str:
+                try:
+                    episode = int(episode_str.group(1))
+                except Exception as err:
+                    logger.debug(f'识别集失败：{str(err)} - {traceback.format_exc()}')
+                    return
+                if episode >= 10000:
+                    return
+                if self.begin_episode is None:
+                    self.begin_episode = episode
+                    self.total_episode = 1
+                self.type = MediaType.TV
+                self._subtitle_flag = True
+        elif re.search(r'[全第季集话話期幕]', title_text, re.IGNORECASE):
+            # 全x季 x季全
+            season_all_str = re.search(r"%s" % self._subtitle_season_all_re, title_text, re.IGNORECASE)
+            if season_all_str:
+                season_all = season_all_str.group(1)
+                if not season_all:
+                    season_all = season_all_str.group(2)
+                if season_all and self.begin_season is None and self.begin_episode is None:
+                    try:
+                        self.total_season = int(cn2an.cn2an(season_all.strip(), mode='smart'))
+                    except Exception as err:
+                        logger.debug(f'识别季失败：{str(err)} - {traceback.format_exc()}')
+                        return
+                    self.begin_season = 1
+                    self.end_season = self.total_season
+                    self.type = MediaType.TV
+                    self._subtitle_flag = True
+                return
             # 第x季
             season_str = re.search(r'%s' % self._subtitle_season_re, title_text, re.IGNORECASE)
             if season_str:
@@ -146,6 +180,37 @@ class MetaBase(object):
                     self.total_season = (self.end_season - self.begin_season) + 1
                 self.type = MediaType.TV
                 self._subtitle_flag = True
+            # 第x-x集 第x集-x集
+            episode_between_str = re.search(r'%s' % self._subtitle_episode_between_re, title_text, re.IGNORECASE)
+            if episode_between_str:
+                episodes = episode_between_str.groups()
+                if episodes:
+                    begin_episode = episodes[0]
+                    end_episode = episodes[1]
+                else:
+                    return
+                try:
+                    begin_episode = int(cn2an.cn2an(begin_episode.strip(), mode='smart'))
+                    end_episode = int(cn2an.cn2an(end_episode.strip(), mode='smart'))
+                except Exception as err:
+                    logger.debug(f'识别集失败：{str(err)} - {traceback.format_exc()}')
+                    return
+                if begin_episode and begin_episode >= 10000:
+                    return
+                if end_episode and end_episode >= 10000:
+                    return
+                if self.begin_episode is None and isinstance(begin_episode, int):
+                    self.begin_episode = begin_episode
+                    self.total_episode = 1
+                if self.begin_episode is not None \
+                        and self.end_episode is None \
+                        and isinstance(end_episode, int) \
+                        and end_episode != self.begin_episode:
+                    self.end_episode = end_episode
+                    self.total_episode = (self.end_episode - self.begin_episode) + 1
+                self.type = MediaType.TV
+                self._subtitle_flag = True
+                return
             # 第x集
             episode_str = re.search(r'%s' % self._subtitle_episode_re, title_text, re.IGNORECASE)
             if episode_str:
@@ -181,6 +246,7 @@ class MetaBase(object):
                     self.total_episode = (self.end_episode - self.begin_episode) + 1
                 self.type = MediaType.TV
                 self._subtitle_flag = True
+                return
             # x集全
             episode_all_str = re.search(r'%s' % self._subtitle_episode_all_re, title_text, re.IGNORECASE)
             if episode_all_str:
@@ -197,22 +263,7 @@ class MetaBase(object):
                     self.end_episode = None
                     self.type = MediaType.TV
                     self._subtitle_flag = True
-            # 全x季 x季全
-            season_all_str = re.search(r"%s" % self._subtitle_season_all_re, title_text, re.IGNORECASE)
-            if season_all_str:
-                season_all = season_all_str.group(1)
-                if not season_all:
-                    season_all = season_all_str.group(2)
-                if season_all and self.begin_season is None and self.begin_episode is None:
-                    try:
-                        self.total_season = int(cn2an.cn2an(season_all.strip(), mode='smart'))
-                    except Exception as err:
-                        logger.debug(f'识别季失败：{str(err)} - {traceback.format_exc()}')
-                        return
-                    self.begin_season = 1
-                    self.end_season = self.total_season
-                    self.type = MediaType.TV
-                    self._subtitle_flag = True
+                return
 
     @property
     def season(self) -> str:
@@ -240,7 +291,7 @@ class MetaBase(object):
             return self.season
         else:
             return ""
-    
+
     @property
     def season_seq(self) -> str:
         """
@@ -283,7 +334,7 @@ class MetaBase(object):
                          str(self.end_episode).rjust(2, "0"))
         else:
             return ""
-    
+
     @property
     def episode_list(self) -> List[int]:
         """
@@ -481,7 +532,7 @@ class MetaBase(object):
             self.end_episode = end
         if self.begin_episode and self.end_episode:
             self.total_episode = (self.end_episode - self.begin_episode) + 1
-            
+
     def merge(self, meta: Self):
         """
         全并Meta信息
@@ -499,13 +550,13 @@ class MetaBase(object):
             self.year = meta.year
         # 季
         if (self.type == MediaType.TV
-                and not self.season):
+                and self.begin_season is None):
             self.begin_season = meta.begin_season
             self.end_season = meta.end_season
             self.total_season = meta.total_season
         # 开始集
         if (self.type == MediaType.TV
-                and not self.episode):
+                and self.begin_episode is None):
             self.begin_episode = meta.begin_episode
             self.end_episode = meta.end_episode
             self.total_episode = meta.total_episode

app/core/meta/metavideo.py

@@ -1,13 +1,16 @@
 import re
 from pathlib import Path
+from typing import Optional
+
+from Pinyin2Hanzi import is_pinyin
 
 from app.core.config import settings
 from app.core.meta.customization import CustomizationMatcher
 from app.core.meta.metabase import MetaBase
 from app.core.meta.releasegroup import ReleaseGroupsMatcher
+from app.schemas.types import MediaType
 from app.utils.string import StringUtils
 from app.utils.tokens import Tokens
-from app.schemas.types import MediaType
 
 
 class MetaVideo(MetaBase):
@@ -31,7 +34,7 @@ class MetaVideo(MetaBase):
     _source_re = r"^BLURAY$|^HDTV$|^UHDTV$|^HDDVD$|^WEBRIP$|^DVDRIP$|^BDRIP$|^BLU$|^WEB$|^BD$|^HDRip$"
     _effect_re = r"^REMUX$|^UHD$|^SDR$|^HDR\d*$|^DOLBY$|^DOVI$|^DV$|^3D$|^REPACK$"
     _resources_type_re = r"%s|%s" % (_source_re, _effect_re)
-    _name_no_begin_re = r"^\[.+?]"
+    _name_no_begin_re = r"^[\[【].+?[\]】]"
     _name_no_chinese_re = r".*版|.*字幕"
     _name_se_words = ['共', '第', '季', '集', '话', '話', '期']
     _name_movie_words = ['剧场版', '劇場版', '电影版', '電影版']
@@ -39,19 +42,25 @@ class MetaVideo(MetaBase):
                         r"|HBO$|\s+HBO|\d{1,2}th|\d{1,2}bit|NETFLIX|AMAZON|IMAX|^3D|\s+3D|^BBC\s+|\s+BBC|BBC$|DISNEY\+?|XXX|\s+DC$" \
                         r"|[第\s共]+[0-9一二三四五六七八九十\-\s]+季" \
                         r"|[第\s共]+[0-9一二三四五六七八九十百零\-\s]+[集话話]" \
-                        r"|连载|日剧|美剧|电视剧|动画片|动漫|欧美|西德|日韩|超高清|高清|蓝光|翡翠台|梦幻天堂·龙网|★?\d*月?新番" \
-                        r"|最终季|合集|[多中国英葡法俄日韩德意西印泰台港粤双文语简繁体特效内封官译外挂]+字幕|版本|出品|台版|港版|\w+字幕组" \
+                        r"|连载|日剧|美剧|电视剧|动画片|动漫|欧美|西德|日韩|超高清|高清|无水印|下载|蓝光|翡翠台|梦幻天堂·龙网|★?\d*月?新番" \
+                        r"|最终季|合集|[多中国英葡法俄日韩德意西印泰台港粤双文语简繁体特效内封官译外挂]+字幕|版本|出品|台版|港版|\w+字幕组|\w+字幕社" \
                         r"|未删减版|UNCUT$|UNRATE$|WITH EXTRAS$|RERIP$|SUBBED$|PROPER$|REPACK$|SEASON$|EPISODE$|Complete$|Extended$|Extended Version$" \
                         r"|S\d{2}\s*-\s*S\d{2}|S\d{2}|\s+S\d{1,2}|EP?\d{2,4}\s*-\s*EP?\d{2,4}|EP?\d{2,4}|\s+EP?\d{1,4}" \
                         r"|CD[\s.]*[1-9]|DVD[\s.]*[1-9]|DISK[\s.]*[1-9]|DISC[\s.]*[1-9]" \
                         r"|[248]K|\d{3,4}[PIX]+" \
-                        r"|CD[\s.]*[1-9]|DVD[\s.]*[1-9]|DISK[\s.]*[1-9]|DISC[\s.]*[1-9]"
+                        r"|CD[\s.]*[1-9]|DVD[\s.]*[1-9]|DISK[\s.]*[1-9]|DISC[\s.]*[1-9]|\s+GB"
     _resources_pix_re = r"^[SBUHD]*(\d{3,4}[PI]+)|\d{3,4}X(\d{3,4})"
     _resources_pix_re2 = r"(^[248]+K)"
     _video_encode_re = r"^[HX]26[45]$|^AVC$|^HEVC$|^VC\d?$|^MPEG\d?$|^Xvid$|^DivX$|^HDR\d*$"
     _audio_encode_re = r"^DTS\d?$|^DTSHD$|^DTSHDMA$|^Atmos$|^TrueHD\d?$|^AC3$|^\dAudios?$|^DDP\d?$|^DD\d?$|^LPCM\d?$|^AAC\d?$|^FLAC\d?$|^HD\d?$|^MA\d?$"
 
     def __init__(self, title: str, subtitle: str = None, isfile: bool = False):
+        """
+        初始化
+        :param title: 标题
+        :param subtitle: 副标题
+        :param isfile: 是否是文件名
+        """
         super().__init__(title, subtitle, isfile)
         if not title:
             return
@@ -130,12 +139,47 @@ class MetaVideo(MetaBase):
         # 处理part
         if self.part and self.part.upper() == "PART":
             self.part = None
+        # 没有中文标题时，偿试中描述中获取中文名
+        if not self.cn_name and self.en_name and self.subtitle:
+            if self.__is_pinyin(self.en_name):
+                # 英文名是拼音
+                cn_name = self.__get_title_from_description(self.subtitle)
+                if cn_name and len(cn_name) == len(self.en_name.split()):
+                    # 中文名和拼音单词数相同，认为是中文名
+                    self.cn_name = cn_name
         # 制作组/字幕组
         self.resource_team = ReleaseGroupsMatcher().match(title=original_title) or None
         # 自定义占位符
         self.customization = CustomizationMatcher().match(title=original_title) or None
 
+    @staticmethod
+    def __get_title_from_description(description: str) -> Optional[str]:
+        """
+        从描述中提取标题
+        """
+        if not description:
+            return None
+        titles = re.split(r'[\s/|]+', description)
+        if StringUtils.is_chinese(titles[0]):
+            return titles[0]
+        return None
+
+    @staticmethod
+    def __is_pinyin(name_str: str) -> bool:
+        """
+        判断是否拼音
+        """
+        if not name_str:
+            return False
+        for n in name_str.lower().split():
+            if not is_pinyin(n):
+                return False
+        return True
+
     def __fix_name(self, name: str):
+        """
+        去掉名字中不需要的干扰字符
+        """
         if not name:
             return name
         name = re.sub(r'%s' % self._name_nostring_re, '', name,
@@ -157,6 +201,9 @@ class MetaVideo(MetaBase):
         return name
 
     def __init_name(self, token: str):
+        """
+        识别名称
+        """
         if not token:
             return
         # 回收标题
@@ -250,6 +297,9 @@ class MetaVideo(MetaBase):
                 self._last_token_type = "enname"
 
     def __init_part(self, token: str):
+        """
+        识别Part
+        """
         if not self.name:
             return
         if not self.year \
@@ -273,6 +323,9 @@ class MetaVideo(MetaBase):
             # self._stop_name_flag = False
 
     def __init_year(self, token: str):
+        """
+        识别年份
+        """
         if not self.name:
             return
         if not token.isdigit():
@@ -295,6 +348,9 @@ class MetaVideo(MetaBase):
         self._stop_name_flag = True
 
     def __init_resource_pix(self, token: str):
+        """
+        识别分辨率
+        """
         if not self.name:
             return
         re_res = re.findall(r"%s" % self._resources_pix_re, token, re.IGNORECASE)
@@ -331,6 +387,9 @@ class MetaVideo(MetaBase):
                     self.resource_pix = re_res.group(1).lower()
 
     def __init_season(self, token: str):
+        """
+        识别季
+        """
         re_res = re.findall(r"%s" % self._season_re, token, re.IGNORECASE)
         if re_res:
             self._last_token_type = "season"
@@ -380,6 +439,9 @@ class MetaVideo(MetaBase):
             self.begin_season = 1
 
     def __init_episode(self, token: str):
+        """
+        识别集
+        """
         re_res = re.findall(r"%s" % self._episode_re, token, re.IGNORECASE)
         if re_res:
             self._last_token_type = "episode"
@@ -450,6 +512,9 @@ class MetaVideo(MetaBase):
             self._last_token_type = "EPISODE"
 
     def __init_resource_type(self, token):
+        """
+        识别资源类型
+        """
         if not self.name:
             return
         source_res = re.search(r"(%s)" % self._source_re, token, re.IGNORECASE)
@@ -488,6 +553,9 @@ class MetaVideo(MetaBase):
             self._last_token = effect.upper()
 
     def __init_video_encode(self, token: str):
+        """
+        识别视频编码
+        """
         if not self.name:
             return
         if not self.year \
@@ -528,6 +596,9 @@ class MetaVideo(MetaBase):
                 self.video_encode = f"{self.video_encode} 10bit"
 
     def __init_audio_encode(self, token: str):
+        """
+        识别音频编码
+        """
         if not self.name:
             return
         if not self.year \

app/core/meta/words.py

@@ -1,4 +1,3 @@
-import traceback
 from typing import List, Tuple
 
 import cn2an
@@ -26,7 +25,7 @@ class WordsMatcher(metaclass=Singleton):
         # 读取自定义识别词
         words: List[str] = self.systemconfig.get(SystemConfigKey.CustomIdentifiers) or []
         for word in words:
-            if not word or word.find('#') == 0:
+            if not word or word.startswith("#"):
                 continue
             try:
                 if word.count(" => ") and word.count(" && ") and word.count(" >> ") and word.count(" <> "):
@@ -54,17 +53,18 @@ class WordsMatcher(metaclass=Singleton):
                     strings = word.split(" <> ")
                     offsets = strings[1].split(" >> ")
                     strings[1] = offsets[0]
-                    title, message, state = self.__episode_offset(title, strings[0], strings[1],
-                                                                  offsets[1])
+                    title, message, state = self.__episode_offset(title, strings[0], strings[1], offsets[1])
                 else:
                     # 屏蔽词
+                    if not word.strip():
+                        continue
                     title, message, state = self.__replace_regex(title, word, "")
 
                 if state:
                     appley_words.append(word)
 
             except Exception as err:
-                logger.error(f"自定义识别词预处理标题失败：{str(err)} - {traceback.format_exc()}")
+                logger.warn(f"自定义识别词 {word} 预处理标题失败：{str(err)} - 标题：{title}")
 
         return title, appley_words
 
@@ -79,7 +79,7 @@ class WordsMatcher(metaclass=Singleton):
             else:
                 return re.sub(r'%s' % replaced, r'%s' % replace, title), "", True
         except Exception as err:
-            logger.error(f"自定义识别词正则替换失败：{str(err)} - {traceback.format_exc()}")
+            logger.warn(f"自定义识别词正则替换失败：{str(err)} - 标题：{title}，被替换词：{replaced}，替换词：{replace}")
             return title, str(err), False
 
     @staticmethod
@@ -131,5 +131,5 @@ class WordsMatcher(metaclass=Singleton):
                 title = re.sub(episode_offset_re, r'%s' % episode_num[1], title)
             return title, "", True
         except Exception as err:
-            logger.error(f"自定义识别词集数偏移失败：{str(err)} - {traceback.format_exc()}")
+            logger.warn(f"自定义识别词集数偏移失败：{str(err)} - 标题：{title}，前定位词：{front}，后定位词：{back}，偏移量：{offset}")
             return title, str(err), False

app/core/metainfo.py

@@ -61,7 +61,7 @@ def MetaInfoPath(path: Path) -> MetaBase:
     :param path: 路径
     """
     # 文件元数据，不包含后缀
-    file_meta = MetaInfo(title=path.stem)
+    file_meta = MetaInfo(title=path.name)
     # 上级目录元数据
     dir_meta = MetaInfo(title=path.parent.name)
     # 合并元数据

app/core/module.py

@@ -78,9 +78,12 @@ class ModuleManager(metaclass=Singleton):
         if not setting:
             return True
         switch, value = setting
-        if getattr(settings, switch) and value is True:
+        option = getattr(settings, switch)
+        if not option:
+            return False
+        if option and value is True:
             return True
-        if value in getattr(settings, switch):
+        if value in option:
             return True
         return False
 

app/core/plugin.py

@@ -1,6 +1,9 @@
+import concurrent
+import concurrent.futures
 import traceback
-from typing import List, Any, Dict, Tuple
+from typing import List, Any, Dict, Tuple, Optional
 
+from app import schemas
 from app.core.config import settings
 from app.core.event import eventmanager
 from app.db.systemconfig_oper import SystemConfigOper
@@ -32,8 +35,6 @@ class PluginManager(metaclass=Singleton):
         self.siteshelper = SitesHelper()
         self.pluginhelper = PluginHelper()
         self.systemconfig = SystemConfigOper()
-        self.install_online_plugin()
-        self.init_config()
 
     def init_config(self):
         # 停止已有插件
@@ -41,9 +42,10 @@ class PluginManager(metaclass=Singleton):
         # 启动插件
         self.start()
 
-    def start(self):
+    def start(self, pid: str = None):
         """
         启动加载插件
+        :param pid: 插件ID，为空加载所有插件
         """
         # 扫描插件目录
         plugins = ModuleHelper.load(
@@ -54,10 +56,10 @@ class PluginManager(metaclass=Singleton):
         installed_plugins = self.systemconfig.get(SystemConfigKey.UserInstalledPlugins) or []
         # 排序
         plugins.sort(key=lambda x: x.plugin_order if hasattr(x, "plugin_order") else 0)
-        self._running_plugins = {}
-        self._plugins = {}
         for plugin in plugins:
             plugin_id = plugin.__name__
+            if pid and plugin_id != pid:
+                continue
             try:
                 # 存储Class
                 self._plugins[plugin_id] = plugin
@@ -81,9 +83,11 @@ class PluginManager(metaclass=Singleton):
             except Exception as err:
                 logger.error(f"加载插件 {plugin_id} 出错：{str(err)} - {traceback.format_exc()}")
 
-    def reload_plugin(self, plugin_id: str, conf: dict):
+    def init_plugin(self, plugin_id: str, conf: dict):
         """
-        重新加载插件
+        初始化插件
+        :param plugin_id: 插件ID
+        :param conf: 插件配置
         """
         if not self._running_plugins.get(plugin_id):
             return
@@ -95,21 +99,57 @@ class PluginManager(metaclass=Singleton):
             # 设置事件状态为不可用
             eventmanager.disable_events_hander(plugin_id)
 
-    def stop(self):
+    def stop(self, pid: str = None):
         """
-        停止
+        停止插件服务
+        :param pid: 插件ID，为空停止所有插件
         """
-        # 停止所有插件
-        for plugin in self._running_plugins.values():
-            # 关闭数据库
-            if hasattr(plugin, "close"):
-                plugin.close()
-            # 关闭插件
-            if hasattr(plugin, "stop_service"):
-                plugin.stop_service()
+        # 停止插件
+        for plugin_id, plugin in self._running_plugins.items():
+            if pid and plugin_id != pid:
+                continue
+            self.__stop_plugin(plugin)
         # 清空对像
-        self._plugins = {}
-        self._running_plugins = {}
+        if pid:
+            # 清空指定插件
+            if pid in self._running_plugins:
+                self._running_plugins.pop(pid)
+            if pid in self._plugins:
+                self._plugins.pop(pid)
+        else:
+            # 清空
+            self._plugins = {}
+            self._running_plugins = {}
+
+    @staticmethod
+    def __stop_plugin(plugin: Any):
+        """
+        停止插件
+        :param plugin: 插件实例
+        """
+        # 关闭数据库
+        if hasattr(plugin, "close"):
+            plugin.close()
+        # 关闭插件
+        if hasattr(plugin, "stop_service"):
+            plugin.stop_service()
+
+    def remove_plugin(self, plugin_id: str):
+        """
+        从内存中移除一个插件
+        :param plugin_id: 插件ID
+        """
+        self.stop(plugin_id)
+
+    def reload_plugin(self, plugin_id: str):
+        """
+        将一个插件重新加载到内存
+        :param plugin_id: 插件ID
+        """
+        # 先移除
+        self.stop(plugin_id)
+        # 重新加载
+        self.start(plugin_id)
 
     def install_online_plugin(self):
         """
@@ -117,32 +157,33 @@ class PluginManager(metaclass=Singleton):
         """
         if SystemUtils.is_frozen():
             return
-        logger.info("开始安装在线插件...")
+        logger.info("开始安装第三方插件...")
         # 已安装插件
         install_plugins = self.systemconfig.get(SystemConfigKey.UserInstalledPlugins) or []
         # 在线插件
         online_plugins = self.get_online_plugins()
         if not online_plugins:
-            logger.error("未获取到在线插件")
+            logger.error("未获取到第三方插件")
             return
         # 支持更新的插件自动更新
         for plugin in online_plugins:
             # 只处理已安装的插件
-            if plugin.get("id") in install_plugins and not self.is_plugin_exists(plugin.get("id")):
+            if plugin.id in install_plugins and not self.is_plugin_exists(plugin.id):
                 # 下载安装
-                state, msg = self.pluginhelper.install(pid=plugin.get("id"),
-                                                       repo_url=plugin.get("repo_url"))
+                state, msg = self.pluginhelper.install(pid=plugin.id,
+                                                       repo_url=plugin.repo_url)
                 # 安装失败
                 if not state:
                     logger.error(
-                        f"插件 {plugin.get('plugin_name')} v{plugin.get('plugin_version')} 安装失败：{msg}")
+                        f"插件 {plugin.plugin_name} v{plugin.plugin_version} 安装失败：{msg}")
                     continue
-                logger.info(f"插件 {plugin.get('plugin_name')} 安装成功，版本：{plugin.get('plugin_version')}")
-        logger.info("在线插件安装完成")
+                logger.info(f"插件 {plugin.plugin_name} 安装成功，版本：{plugin.plugin_version}")
+        logger.info("第三方插件安装完成")
 
     def get_plugin_config(self, pid: str) -> dict:
         """
         获取插件配置
+        :param pid: 插件ID
         """
         if not self._plugins.get(pid):
             return {}
@@ -155,6 +196,8 @@ class PluginManager(metaclass=Singleton):
     def save_plugin_config(self, pid: str, conf: dict) -> bool:
         """
         保存插件配置
+        :param pid: 插件ID
+        :param conf: 配置
         """
         if not self._plugins.get(pid):
             return False
@@ -163,6 +206,7 @@ class PluginManager(metaclass=Singleton):
     def delete_plugin_config(self, pid: str) -> bool:
         """
         删除插件配置
+        :param pid: 插件ID
         """
         if not self._plugins.get(pid):
             return False
@@ -171,6 +215,7 @@ class PluginManager(metaclass=Singleton):
     def get_plugin_form(self, pid: str) -> Tuple[List[dict], Dict[str, Any]]:
         """
         获取插件表单
+        :param pid: 插件ID
         """
         if not self._running_plugins.get(pid):
             return [], {}
@@ -181,6 +226,7 @@ class PluginManager(metaclass=Singleton):
     def get_plugin_page(self, pid: str) -> List[dict]:
         """
         获取插件页面
+        :param pid: 插件ID
         """
         if not self._running_plugins.get(pid):
             return []
@@ -202,7 +248,10 @@ class PluginManager(metaclass=Singleton):
         for _, plugin in self._running_plugins.items():
             if hasattr(plugin, "get_command") \
                     and ObjectUtils.check_method(plugin.get_command):
-                ret_commands += plugin.get_command() or []
+                try:
+                    ret_commands += plugin.get_command() or []
+                except Exception as e:
+                    logger.error(f"获取插件命令出错：{str(e)}")
         return ret_commands
 
     def get_plugin_apis(self) -> List[Dict[str, Any]]:
@@ -220,10 +269,13 @@ class PluginManager(metaclass=Singleton):
         for pid, plugin in self._running_plugins.items():
             if hasattr(plugin, "get_api") \
                     and ObjectUtils.check_method(plugin.get_api):
-                apis = plugin.get_api() or []
-                for api in apis:
-                    api["path"] = f"/{pid}{api['path']}"
-                ret_apis.extend(apis)
+                try:
+                    apis = plugin.get_api() or []
+                    for api in apis:
+                        api["path"] = f"/{pid}{api['path']}"
+                    ret_apis.extend(apis)
+                except Exception as e:
+                    logger.error(f"获取插件 {pid} API出错：{str(e)}")
         return ret_apis
 
     def get_plugin_services(self) -> List[Dict[str, Any]]:
@@ -241,14 +293,19 @@ class PluginManager(metaclass=Singleton):
         for pid, plugin in self._running_plugins.items():
             if hasattr(plugin, "get_service") \
                     and ObjectUtils.check_method(plugin.get_service):
-                services = plugin.get_service()
-                if services:
-                    ret_services.extend(services)
+                try:
+                    services = plugin.get_service()
+                    if services:
+                        ret_services.extend(services)
+                except Exception as e:
+                    logger.error(f"获取插件 {pid} 服务出错：{str(e)}")
         return ret_services
 
     def get_plugin_attr(self, pid: str, attr: str) -> Any:
         """
         获取插件属性
+        :param pid: 插件ID
+        :param attr: 属性名
         """
         if not self._running_plugins.get(pid):
             return None
@@ -259,6 +316,10 @@ class PluginManager(metaclass=Singleton):
     def run_plugin_method(self, pid: str, method: str, *args, **kwargs) -> Any:
         """
         运行插件方法
+        :param pid: 插件ID
+        :param method: 方法名
+        :param args: 参数
+        :param kwargs: 关键字参数
         """
         if not self._running_plugins.get(pid):
             return None
@@ -278,43 +339,41 @@ class PluginManager(metaclass=Singleton):
         """
         return list(self._running_plugins.keys())
 
-    def get_online_plugins(self) -> List[dict]:
+    def get_online_plugins(self) -> List[schemas.Plugin]:
         """
         获取所有在线插件信息
         """
-        # 返回值
-        all_confs = []
-        if not settings.PLUGIN_MARKET:
-            return all_confs
-        # 已安装插件
-        installed_apps = self.systemconfig.get(SystemConfigKey.UserInstalledPlugins) or []
-        # 线上插件列表
-        markets = settings.PLUGIN_MARKET.split(",")
-        for market in markets:
+
+        def __get_plugin_info(market: str) -> Optional[List[schemas.Plugin]]:
+            """
+            获取插件信息
+            """
             online_plugins = self.pluginhelper.get_plugins(market) or {}
             if not online_plugins:
-                logger.warn(f"获取插件库失败 {market}")
-            for pid, plugin in online_plugins.items():
+                logger.warn(f"获取插件库失败：{market}")
+                return
+            ret_plugins = []
+            for pid, plugin_info in online_plugins.items():
                 # 运行状插件
                 plugin_obj = self._running_plugins.get(pid)
                 # 非运行态插件
                 plugin_static = self._plugins.get(pid)
                 # 基本属性
-                conf = {}
+                plugin = schemas.Plugin()
                 # ID
-                conf.update({"id": pid})
+                plugin.id = pid
                 # 安装状态
                 if pid in installed_apps and plugin_static:
-                    conf.update({"installed": True})
+                    plugin.installed = True
                 else:
-                    conf.update({"installed": False})
+                    plugin.installed = False
                 # 是否有新版本
-                conf.update({"has_update": False})
+                plugin.has_update = False
                 if plugin_static:
                     installed_version = getattr(plugin_static, "plugin_version")
-                    if StringUtils.compare_version(installed_version, plugin.get("version")) < 0:
+                    if StringUtils.compare_version(installed_version, plugin_info.get("version")) < 0:
                         # 需要更新
-                        conf.update({"has_update": True})
+                        plugin.has_update = True
                 # 运行状态
                 if plugin_obj and hasattr(plugin_obj, "get_state"):
                     try:
@@ -322,65 +381,96 @@ class PluginManager(metaclass=Singleton):
                     except Exception as e:
                         logger.error(f"获取插件 {pid} 状态出错：{str(e)}")
                         state = False
-                    conf.update({"state": state})
+                    plugin.state = state
                 else:
-                    conf.update({"state": False})
+                    plugin.state = False
                 # 是否有详情页面
-                conf.update({"has_page": False})
+                plugin.has_page = False
                 if plugin_obj and hasattr(plugin_obj, "get_page"):
                     if ObjectUtils.check_method(plugin_obj.get_page):
-                        conf.update({"has_page": True})
+                        plugin.has_page = True
                 # 权限
-                if plugin.get("level"):
-                    conf.update({"auth_level": plugin.get("level")})
-                    if self.siteshelper.auth_level < plugin.get("level"):
+                if plugin_info.get("level"):
+                    plugin.auth_level = plugin_info.get("level")
+                    if self.siteshelper.auth_level < plugin.auth_level:
                         continue
                 # 名称
-                if plugin.get("name"):
-                    conf.update({"plugin_name": plugin.get("name")})
+                if plugin_info.get("name"):
+                    plugin.plugin_name = plugin_info.get("name")
                 # 描述
-                if plugin.get("description"):
-                    conf.update({"plugin_desc": plugin.get("description")})
+                if plugin_info.get("description"):
+                    plugin.plugin_desc = plugin_info.get("description")
                 # 版本
-                if plugin.get("version"):
-                    conf.update({"plugin_version": plugin.get("version")})
+                if plugin_info.get("version"):
+                    plugin.plugin_version = plugin_info.get("version")
                 # 图标
-                if plugin.get("icon"):
-                    conf.update({"plugin_icon": plugin.get("icon")})
+                if plugin_info.get("icon"):
+                    plugin.plugin_icon = plugin_info.get("icon")
                 # 作者
-                if plugin.get("author"):
-                    conf.update({"plugin_author": plugin.get("author")})
+                if plugin_info.get("author"):
+                    plugin.plugin_author = plugin_info.get("author")
+                # 更新历史
+                if plugin_info.get("history"):
+                    plugin.history = plugin_info.get("history")
                 # 仓库链接
-                conf.update({"repo_url": market})
+                plugin.repo_url = market
                 # 本地标志
-                conf.update({"is_local": False})
+                plugin.is_local = False
                 # 汇总
-                all_confs.append(conf)
-        # 按插件ID去重
-        if all_confs:
-            all_confs = list({v["id"]: v for v in all_confs}.values())
-        return all_confs
+                ret_plugins.append(plugin)
 
-    def get_local_plugins(self) -> List[dict]:
+            return ret_plugins
+
+        if not settings.PLUGIN_MARKET:
+            return []
+        # 返回值
+        all_plugins = []
+        # 已安装插件
+        installed_apps = self.systemconfig.get(SystemConfigKey.UserInstalledPlugins) or []
+        # 使用多线程获取线上插件
+        with concurrent.futures.ThreadPoolExecutor() as executor:
+            futures = []
+            for m in settings.PLUGIN_MARKET.split(","):
+                futures.append(executor.submit(__get_plugin_info, m))
+            for future in concurrent.futures.as_completed(futures):
+                plugins = future.result()
+                if plugins:
+                    all_plugins.extend(plugins)
+        # 所有插件按repo在设置中的顺序排序
+        all_plugins.sort(
+            key=lambda x: settings.PLUGIN_MARKET.split(",").index(x.repo_url) if x.repo_url else 0
+        )
+        # 按插件ID和版本号去重，相同插件以前面的为准
+        result = []
+        _dup = []
+        for p in all_plugins:
+            key = f"{p.id}v{p.plugin_version}"
+            if key not in _dup:
+                _dup.append(key)
+                result.append(p)
+        logger.info(f"共获取到 {len(result)} 个第三方插件")
+        return result
+
+    def get_local_plugins(self) -> List[schemas.Plugin]:
         """
         获取所有本地已下载的插件信息
         """
         # 返回值
-        all_confs = []
+        plugins = []
         # 已安装插件
         installed_apps = self.systemconfig.get(SystemConfigKey.UserInstalledPlugins) or []
-        for pid, plugin in self._plugins.items():
+        for pid, plugin_class in self._plugins.items():
             # 运行状插件
             plugin_obj = self._running_plugins.get(pid)
             # 基本属性
-            conf = {}
+            plugin = schemas.Plugin()
             # ID
-            conf.update({"id": pid})
+            plugin.id = pid
             # 安装状态
             if pid in installed_apps:
-                conf.update({"installed": True})
+                plugin.installed = True
             else:
-                conf.update({"installed": False})
+                plugin.installed = False
             # 运行状态
             if plugin_obj and hasattr(plugin_obj, "get_state"):
                 try:
@@ -388,50 +478,51 @@ class PluginManager(metaclass=Singleton):
                 except Exception as e:
                     logger.error(f"获取插件 {pid} 状态出错：{str(e)}")
                     state = False
-                conf.update({"state": state})
+                plugin.state = state
             else:
-                conf.update({"state": False})
+                plugin.state = False
             # 是否有详情页面
-            if hasattr(plugin, "get_page"):
-                if ObjectUtils.check_method(plugin.get_page):
-                    conf.update({"has_page": True})
+            if hasattr(plugin_class, "get_page"):
+                if ObjectUtils.check_method(plugin_class.get_page):
+                    plugin.has_page = True
                 else:
-                    conf.update({"has_page": False})
+                    plugin.has_page = False
             # 权限
-            if hasattr(plugin, "auth_level"):
-                conf.update({"auth_level": plugin.auth_level})
+            if hasattr(plugin_class, "auth_level"):
+                plugin.auth_level = plugin_class.auth_level
                 if self.siteshelper.auth_level < plugin.auth_level:
                     continue
             # 名称
-            if hasattr(plugin, "plugin_name"):
-                conf.update({"plugin_name": plugin.plugin_name})
+            if hasattr(plugin_class, "plugin_name"):
+                plugin.plugin_name = plugin_class.plugin_name
             # 描述
-            if hasattr(plugin, "plugin_desc"):
-                conf.update({"plugin_desc": plugin.plugin_desc})
+            if hasattr(plugin_class, "plugin_desc"):
+                plugin.plugin_desc = plugin_class.plugin_desc
             # 版本
-            if hasattr(plugin, "plugin_version"):
-                conf.update({"plugin_version": plugin.plugin_version})
+            if hasattr(plugin_class, "plugin_version"):
+                plugin.plugin_version = plugin_class.plugin_version
             # 图标
-            if hasattr(plugin, "plugin_icon"):
-                conf.update({"plugin_icon": plugin.plugin_icon})
+            if hasattr(plugin_class, "plugin_icon"):
+                plugin.plugin_icon = plugin_class.plugin_icon
             # 作者
-            if hasattr(plugin, "plugin_author"):
-                conf.update({"plugin_author": plugin.plugin_author})
+            if hasattr(plugin_class, "plugin_author"):
+                plugin.plugin_author = plugin_class.plugin_author
             # 作者链接
-            if hasattr(plugin, "author_url"):
-                conf.update({"author_url": plugin.author_url})
+            if hasattr(plugin_class, "author_url"):
+                plugin.author_url = plugin_class.author_url
             # 是否需要更新
-            conf.update({"has_update": False})
+            plugin.has_update = False
             # 本地标志
-            conf.update({"is_local": True})
+            plugin.is_local = True
             # 汇总
-            all_confs.append(conf)
-        return all_confs
+            plugins.append(plugin)
+        return plugins
 
     @staticmethod
     def is_plugin_exists(pid: str) -> bool:
         """
-        判断插件是否存在
+        判断插件是否在本地文件系统存在
+        :param pid: 插件ID
         """
         if not pid:
             return False

app/db/message_oper.py

@@ -0,0 +1,61 @@
+import json
+import time
+from typing import Optional, Union
+
+from sqlalchemy.orm import Session
+
+from app.db import DbOper
+from app.db.models.message import Message
+from app.schemas import MessageChannel, NotificationType
+
+
+class MessageOper(DbOper):
+    """
+    消息数据管理
+    """
+
+    def __init__(self, db: Session = None):
+        super().__init__(db)
+
+    def add(self,
+            channel: MessageChannel = None,
+            mtype: NotificationType = None,
+            title: str = None,
+            text: str = None,
+            image: str = None,
+            link: str = None,
+            userid: str = None,
+            action: int = 1,
+            note: Union[list, dict] = None,
+            **kwargs):
+        """
+        新增媒体服务器数据
+        :param channel: 消息渠道
+        :param mtype: 消息类型
+        :param title: 标题
+        :param text: 文本内容
+        :param image: 图片
+        :param link: 链接
+        :param userid: 用户ID
+        :param action: 消息方向：0-接收息，1-发送消息
+        :param note: 附件json
+        """
+        kwargs.update({
+            "channel": channel.value if channel else '',
+            "mtype": mtype.value if mtype else '',
+            "title": title,
+            "text": text,
+            "image": image,
+            "link": link,
+            "userid": userid,
+            "action": action,
+            "reg_time": time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()),
+            "note": json.dumps(note) if note else ''
+        })
+        Message(**kwargs).create(self._db)
+
+    def list_by_page(self, page: int = 1, count: int = 30) -> Optional[str]:
+        """
+        获取媒体服务器数据ID
+        """
+        return Message.list_by_page(self._db, page, count)

app/db/models/downloadhistory.py

@@ -200,6 +200,7 @@ class DownloadFiles(Base):
         result = db.query(DownloadFiles).filter(DownloadFiles.savepath == savepath).all()
         return list(result)
 
+    @staticmethod
     @db_update
     def delete_by_fullpath(db: Session, fullpath: str):
         db.query(DownloadFiles).filter(DownloadFiles.fullpath == fullpath,

app/db/models/message.py

@@ -0,0 +1,39 @@
+from sqlalchemy import Column, Integer, String, Sequence
+from sqlalchemy.orm import Session
+
+from app.db import db_query, Base
+
+
+class Message(Base):
+    """
+    消息表
+    """
+    id = Column(Integer, Sequence('id'), primary_key=True, index=True)
+    # 消息渠道
+    channel = Column(String)
+    # 消息类型
+    mtype = Column(String)
+    # 标题
+    title = Column(String)
+    # 文本内容
+    text = Column(String)
+    # 图片
+    image = Column(String)
+    # 链接
+    link = Column(String)
+    # 用户ID
+    userid = Column(String)
+    # 登记时间
+    reg_time = Column(String, index=True)
+    # 消息方向：0-接收息，1-发送消息
+    action = Column(Integer)
+    # 附件json
+    note = Column(String)
+
+    @staticmethod
+    @db_query
+    def list_by_page(db: Session, page: int = 1, count: int = 30):
+        result = db.query(Message).order_by(Message.reg_time.desc()).offset((page - 1) * count).limit(
+            count).all()
+        result.sort(key=lambda x: x.reg_time, reverse=False)
+        return list(result)

app/db/models/sitestatistic.py

@@ -0,0 +1,37 @@
+from datetime import datetime
+
+from sqlalchemy import Column, Integer, String, Sequence
+from sqlalchemy.orm import Session
+
+from app.db import db_query, db_update, Base
+
+
+class SiteStatistic(Base):
+    """
+    站点统计表
+    """
+    id = Column(Integer, Sequence('id'), primary_key=True, index=True)
+    # 域名Key
+    domain = Column(String, index=True)
+    # 成功次数
+    success = Column(Integer)
+    # 失败次数
+    fail = Column(Integer)
+    # 平均耗时 秒
+    seconds = Column(Integer)
+    # 最后一次访问状态 0-成功 1-失败
+    lst_state = Column(Integer)
+    # 最后访问时间
+    lst_mod_date = Column(String, default=datetime.now().strftime("%Y-%m-%d %H:%M:%S"))
+    # 耗时记录 Json
+    note = Column(String)
+
+    @staticmethod
+    @db_query
+    def get_by_domain(db: Session, domain: str):
+        return db.query(SiteStatistic).filter(SiteStatistic.domain == domain).first()
+
+    @staticmethod
+    @db_update
+    def reset(db: Session):
+        db.query(SiteStatistic).delete()

app/db/models/subscribe.py

@@ -1,6 +1,6 @@
 import time
 
-from sqlalchemy import Column, Integer, String, Sequence
+from sqlalchemy import Column, Integer, String, Sequence, Float
 from sqlalchemy.orm import Session
 
 from app.db import db_query, db_update, Base
@@ -23,14 +23,15 @@ class Subscribe(Base):
     imdbid = Column(String)
     tvdbid = Column(Integer)
     doubanid = Column(String, index=True)
+    bangumiid = Column(Integer, index=True)
     # 季号
     season = Column(Integer)
     # 海报
     poster = Column(String)
     # 背景图
     backdrop = Column(String)
-    # 评分
-    vote = Column(Integer)
+    # 评分，float
+    vote = Column(Float)
     # 简介
     description = Column(String)
     # 过滤规则
@@ -115,6 +116,11 @@ class Subscribe(Base):
     def get_by_doubanid(db: Session, doubanid: str):
         return db.query(Subscribe).filter(Subscribe.doubanid == doubanid).first()
 
+    @staticmethod
+    @db_query
+    def get_by_bangumiid(db: Session, bangumiid: int):
+        return db.query(Subscribe).filter(Subscribe.bangumiid == bangumiid).first()
+
     @db_update
     def delete_by_tmdbid(self, db: Session, tmdbid: int, season: int):
         subscrbies = self.get_by_tmdbid(db, tmdbid, season)

app/db/models/subscribehistory.py

@@ -0,0 +1,72 @@
+from sqlalchemy import Column, Integer, String, Sequence, Float
+from sqlalchemy.orm import Session
+
+from app.db import db_query, Base
+
+
+class SubscribeHistory(Base):
+    """
+    订阅历史表
+    """
+    id = Column(Integer, Sequence('id'), primary_key=True, index=True)
+    # 标题
+    name = Column(String, nullable=False, index=True)
+    # 年份
+    year = Column(String)
+    # 类型
+    type = Column(String)
+    # 搜索关键字
+    keyword = Column(String)
+    tmdbid = Column(Integer, index=True)
+    imdbid = Column(String)
+    tvdbid = Column(Integer)
+    doubanid = Column(String, index=True)
+    bangumiid = Column(Integer, index=True)
+    # 季号
+    season = Column(Integer)
+    # 海报
+    poster = Column(String)
+    # 背景图
+    backdrop = Column(String)
+    # 评分，float
+    vote = Column(Float)
+    # 简介
+    description = Column(String)
+    # 过滤规则
+    filter = Column(String)
+    # 包含
+    include = Column(String)
+    # 排除
+    exclude = Column(String)
+    # 质量
+    quality = Column(String)
+    # 分辨率
+    resolution = Column(String)
+    # 特效
+    effect = Column(String)
+    # 总集数
+    total_episode = Column(Integer)
+    # 开始集数
+    start_episode = Column(Integer)
+    # 订阅完成时间
+    date = Column(String)
+    # 订阅用户
+    username = Column(String)
+    # 订阅站点
+    sites = Column(String)
+    # 是否洗版
+    best_version = Column(Integer, default=0)
+    # 保存路径
+    save_path = Column(String)
+    # 是否使用 imdbid 搜索
+    search_imdbid = Column(Integer, default=0)
+
+    @staticmethod
+    @db_query
+    def list_by_type(db: Session, mtype: str, page: int = 1, count: int = 30):
+        result = db.query(SubscribeHistory).filter(
+            SubscribeHistory.type == mtype
+        ).order_by(
+                SubscribeHistory.date.desc()
+        ).offset((page - 1) * count).limit(count).all()
+        return list(result)

app/db/models/transferhistory.py

@@ -1,6 +1,6 @@
 import time
 
-from sqlalchemy import Column, Integer, String, Sequence, Boolean, func
+from sqlalchemy import Column, Integer, String, Sequence, Boolean, func, or_
 from sqlalchemy.orm import Session
 
 from app.db import db_query, db_update, Base
@@ -50,26 +50,33 @@ class TransferHistory(Base):
     @db_query
     def list_by_title(db: Session, title: str, page: int = 1, count: int = 30, status: bool = None):
         if status is not None:
-            result = db.query(TransferHistory).filter(TransferHistory.title.like(f'%{title}%'),
-                                                      TransferHistory.status == status).order_by(
-                TransferHistory.date.desc()).offset((page - 1) * count).limit(
-                count).all()
+            result = db.query(TransferHistory).filter(
+                TransferHistory.status == status
+            ).order_by(
+                TransferHistory.date.desc()
+            ).offset((page - 1) * count).limit(count).all()
         else:
-            result = db.query(TransferHistory).filter(TransferHistory.title.like(f'%{title}%')).order_by(
-                TransferHistory.date.desc()).offset((page - 1) * count).limit(
-                count).all()
+            result = db.query(TransferHistory).filter(or_(
+                TransferHistory.src.like(f'%{title}%'),
+                TransferHistory.dest.like(f'%{title}%'),
+            )).order_by(
+                TransferHistory.date.desc()
+            ).offset((page - 1) * count).limit(count).all()
         return list(result)
 
     @staticmethod
     @db_query
     def list_by_page(db: Session, page: int = 1, count: int = 30, status: bool = None):
         if status is not None:
-            result = db.query(TransferHistory).filter(TransferHistory.status == status).order_by(
-                TransferHistory.date.desc()).offset((page - 1) * count).limit(
-                count).all()
+            result = db.query(TransferHistory).filter(
+                TransferHistory.status == status
+            ).order_by(
+                TransferHistory.date.desc()
+            ).offset((page - 1) * count).limit(count).all()
         else:
-            result = db.query(TransferHistory).order_by(TransferHistory.date.desc()).offset((page - 1) * count).limit(
-                count).all()
+            result = db.query(TransferHistory).order_by(
+                TransferHistory.date.desc()
+            ).offset((page - 1) * count).limit(count).all()
         return list(result)
 
     @staticmethod
@@ -113,10 +120,12 @@ class TransferHistory(Base):
     @db_query
     def count_by_title(db: Session, title: str, status: bool = None):
         if status is not None:
-            return db.query(func.count(TransferHistory.id)).filter(TransferHistory.title.like(f'%{title}%'),
-                                                                   TransferHistory.status == status).first()[0]
+            return db.query(func.count(TransferHistory.id)).filter(TransferHistory.status == status).first()[0]
         else:
-            return db.query(func.count(TransferHistory.id)).filter(TransferHistory.title.like(f'%{title}%')).first()[0]
+            return db.query(func.count(TransferHistory.id)).filter(or_(
+                TransferHistory.src.like(f'%{title}%'),
+                TransferHistory.dest.like(f'%{title}%')
+            )).first()[0]
 
     @staticmethod
     @db_query

app/db/models/user.py

@@ -1,8 +1,12 @@
+from typing import Tuple, Optional
+
 from sqlalchemy import Boolean, Column, Integer, String, Sequence
 from sqlalchemy.orm import Session
 
 from app.core.security import verify_password
 from app.db import db_query, db_update, Base
+from app.schemas import User
+from app.utils.otp import OtpUtils
 
 
 class User(Base):
@@ -23,16 +27,23 @@ class User(Base):
     is_superuser = Column(Boolean(), default=False)
     # 头像
     avatar = Column(String)
+    # 是否启用otp二次验证
+    is_otp = Column(Boolean(), default=False)
+    # otp秘钥
+    otp_secret = Column(String, default=None)
 
     @staticmethod
     @db_query
-    def authenticate(db: Session, name: str, password: str):
+    def authenticate(db: Session, name: str, password: str, otp_password: str) -> Tuple[bool, Optional[User]]:
         user = db.query(User).filter(User.name == name).first()
         if not user:
-            return None
+            return False, None
         if not verify_password(password, str(user.hashed_password)):
-            return None
-        return user
+            return False, user
+        if user.is_otp:
+            if not otp_password or not OtpUtils.check(user.otp_secret, otp_password):
+                return False, user
+        return True, user
 
     @staticmethod
     @db_query
@@ -45,3 +56,14 @@ class User(Base):
         if user:
             user.delete(db, user.id)
         return True
+
+    @db_update
+    def update_otp_by_name(self, db: Session, name: str, otp: bool, secret: str):
+        user = self.get_by_name(db, name)
+        if user:
+            user.update(db, {
+                'is_otp': otp,
+                'otp_secret': secret
+            })
+            return True
+        return False

app/db/subscribe_oper.py

@@ -1,3 +1,4 @@
+import json
 import time
 from typing import Tuple, List
 
@@ -20,6 +21,9 @@ class SubscribeOper(DbOper):
                                      doubanid=mediainfo.douban_id,
                                      season=kwargs.get('season'))
         if not subscribe:
+            if kwargs.get("sites") and not isinstance(kwargs.get("sites"), str):
+                kwargs["sites"] = json.dumps(kwargs.get("sites"))
+
             subscribe = Subscribe(name=mediainfo.title,
                                   year=mediainfo.year,
                                   type=mediainfo.type.value,
@@ -27,6 +31,7 @@ class SubscribeOper(DbOper):
                                   imdbid=mediainfo.imdb_id,
                                   tvdbid=mediainfo.tvdb_id,
                                   doubanid=mediainfo.douban_id,
+                                  bangumiid=mediainfo.bangumi_id,
                                   poster=mediainfo.get_poster_image(),
                                   backdrop=mediainfo.get_backdrop_image(),
                                   vote=mediainfo.vote_average,

app/db/subscribehistory_oper.py

@@ -0,0 +1,27 @@
+import time
+
+from app.db import DbOper
+from app.db.models.subscribehistory import SubscribeHistory
+
+
+class SubscribeHistoryOper(DbOper):
+    """
+    订阅历史管理
+    """
+
+    def add(self, **kwargs):
+        """
+        新增订阅
+        """
+        # 去除kwargs中 SubscribeHistory 没有的字段
+        kwargs = {k: v for k, v in kwargs.items() if hasattr(SubscribeHistory, k)}
+        # 更新完成订阅时间
+        kwargs.update({"date": time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())})
+        subscribe = SubscribeHistory(**kwargs)
+        subscribe.create(self._db)
+
+    def list_by_type(self, mtype: str, page: int = 1, count: int = 30) -> SubscribeHistory:
+        """
+        获取指定类型的订阅
+        """
+        return SubscribeHistory.list_by_type(self._db, mtype=mtype, page=page, count=count)

app/db/systemconfig_oper.py

@@ -56,6 +56,12 @@ class SystemConfigOper(DbOper, metaclass=Singleton):
             return self.__SYSTEMCONF
         return self.__SYSTEMCONF.get(key)
 
+    def all(self):
+        """
+        获取所有系统设置
+        """
+        return self.__SYSTEMCONF or {}
+
     def delete(self, key: Union[str, SystemConfigKey]):
         """
         删除系统设置

app/db/sytestatistic_oper.py

@@ -0,0 +1,70 @@
+import json
+from datetime import datetime
+
+from app.db import DbOper
+from app.db.models.sitestatistic import SiteStatistic
+
+
+class SiteStatisticOper(DbOper):
+    """
+    站点统计管理
+    """
+
+    def success(self, domain: str, seconds: int = None):
+        """
+        站点访问成功
+        """
+        lst_date = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+        sta = SiteStatistic.get_by_domain(self._db, domain)
+        if sta:
+            avg_seconds, note = None, {}
+            if seconds is not None:
+                note: dict = json.loads(sta.note or "{}")
+                note[lst_date] = seconds or 1
+                avg_times = len(note.keys())
+                if avg_times > 10:
+                    note = dict(sorted(note.items(), key=lambda x: x[0], reverse=True)[:10])
+                avg_seconds = sum([v for v in note.values()]) // avg_times
+            sta.update(self._db, {
+                "success": sta.success + 1,
+                "seconds": avg_seconds or sta.seconds,
+                "lst_state": 0,
+                "lst_mod_date": lst_date,
+                "note": json.dumps(note) if note else sta.note
+            })
+        else:
+            note = {}
+            if seconds is not None:
+                note = {
+                    lst_date: seconds or 1
+                }
+            SiteStatistic(
+                domain=domain,
+                success=1,
+                fail=0,
+                seconds=seconds or 1,
+                lst_state=0,
+                lst_mod_date=lst_date,
+                note=json.dumps(note)
+            ).create(self._db)
+
+    def fail(self, domain: str):
+        """
+        站点访问失败
+        """
+        lst_date = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+        sta = SiteStatistic.get_by_domain(self._db, domain)
+        if sta:
+            sta.update(self._db, {
+                "fail": sta.fail + 1,
+                "lst_state": 1,
+                "lst_mod_date": lst_date
+            })
+        else:
+            SiteStatistic(
+                domain=domain,
+                success=0,
+                fail=1,
+                lst_state=1,
+                lst_mod_date=lst_date
+            ).create(self._db)

app/helper/__init__.py

@@ -0,0 +1,2 @@
+from .doh import doh_query_json
+from .cloudflare import under_challenge

app/helper/browser.py

@@ -61,7 +61,7 @@ class PlaywrightHelper:
                         ua: str = None,
                         proxies: dict = None,
                         headless: bool = False,
-                        timeout: int = 30) -> str:
+                        timeout: int = 20) -> str:
         """
         获取网页源码
         :param url: 网页地址

app/helper/cookiecloud.py

@@ -1,68 +1,126 @@
-from typing import Tuple, Optional
+import json
+from hashlib import md5
+from typing import Any, Dict, Tuple, Optional
 
+from app.core.config import settings
+from app.utils.common import decrypt
 from app.utils.http import RequestUtils
 from app.utils.string import StringUtils
 
 
 class CookieCloudHelper:
-
     _ignore_cookies: list = ["CookieAutoDeleteBrowsingDataCleanup", "CookieAutoDeleteCleaningDiscarded"]
 
-    def __init__(self, server: str, key: str, password: str):
-        self._server = server
-        self._key = key
-        self._password = password
+    def __init__(self):
+        self._sync_setting()
         self._req = RequestUtils(content_type="application/json")
 
+    def _sync_setting(self):
+        self._server = settings.COOKIECLOUD_HOST
+        self._key = settings.COOKIECLOUD_KEY
+        self._password = settings.COOKIECLOUD_PASSWORD
+        self._enable_local = settings.COOKIECLOUD_ENABLE_LOCAL
+        self._local_path = settings.COOKIE_PATH
+
     def download(self) -> Tuple[Optional[dict], str]:
         """
         从CookieCloud下载数据
         :return: Cookie数据、错误信息
         """
-        if not self._server or not self._key or not self._password:
+        # 更新为最新设置
+        self._sync_setting()
+
+        if ((not self._server and not self._enable_local)
+                or not self._key
+                or not self._password):
             return None, "CookieCloud参数不正确"
-        req_url = "%s/get/%s" % (self._server, str(self._key).strip())
-        ret = self._req.post_res(url=req_url, json={"password": str(self._password).strip()})
-        if ret and ret.status_code == 200:
-            result = ret.json()
+
+        if self._enable_local:
+            # 开启本地服务时，从本地直接读取数据
+            result = self._load_local_encrypt_data(self._key)
             if not result:
-                return {}, "未下载到数据"
-            if result.get("cookie_data"):
-                contents = result.get("cookie_data")
-            else:
-                contents = result
-            # 整理数据,使用domain域名的最后两级作为分组依据
-            domain_groups = {}
-            for site, cookies in contents.items():
-                for cookie in cookies:
-                    domain_key = StringUtils.get_url_domain(cookie.get("domain"))
-                    if not domain_groups.get(domain_key):
-                        domain_groups[domain_key] = [cookie]
-                    else:
-                        domain_groups[domain_key].append(cookie)
-            # 返回错误
-            ret_cookies = {}
-            # 索引器
-            for domain, content_list in domain_groups.items():
-                if not content_list:
-                    continue
-                # 只有cf的cookie过滤掉
-                cloudflare_cookie = True
-                for content in content_list:
-                    if content["name"] != "cf_clearance":
-                        cloudflare_cookie = False
-                        break
-                if cloudflare_cookie:
-                    continue
-                # 站点Cookie
-                cookie_str = ";".join(
-                    [f"{content.get('name')}={content.get('value')}"
-                     for content in content_list
-                     if content.get("name") and content.get("name") not in self._ignore_cookies]
-                )
-                ret_cookies[domain] = cookie_str
-            return ret_cookies, ""
-        elif ret:
-            return None, f"同步CookieCloud失败，错误码：{ret.status_code}"
+                return {}, "未从本地CookieCloud服务加载到cookie数据，请检查服务器设置、用户KEY及加密密码是否正确"
         else:
-            return None, "CookieCloud请求失败，请检查服务器地址、用户KEY及加密密码是否正确"
+            req_url = "%s/get/%s" % (self._server, str(self._key).strip())
+            ret = self._req.get_res(url=req_url)
+            if ret and ret.status_code == 200:
+                try:
+                    result = ret.json()
+                    if not result:
+                        return {}, f"未从{self._server}下载到cookie数据"
+                except Exception as err:
+                    return {}, f"从{self._server}下载cookie数据错误：{str(err)}"
+            elif ret:
+                return None, f"远程同步CookieCloud失败，错误码：{ret.status_code}"
+            else:
+                return None, "CookieCloud请求失败，请检查服务器地址、用户KEY及加密密码是否正确"
+
+        encrypted = result.get("encrypted")
+        if not encrypted:
+            return {}, "未获取到cookie密文"
+        else:
+            crypt_key = self._get_crypt_key()
+            try:
+                decrypted_data = decrypt(encrypted, crypt_key).decode('utf-8')
+                result = json.loads(decrypted_data)
+            except Exception as e:
+                return {}, "cookie解密失败：" + str(e)
+
+        if not result:
+            return {}, "cookie解密为空"
+
+        if result.get("cookie_data"):
+            contents = result.get("cookie_data")
+        else:
+            contents = result
+        # 整理数据,使用domain域名的最后两级作为分组依据
+        domain_groups = {}
+        for site, cookies in contents.items():
+            for cookie in cookies:
+                domain_key = StringUtils.get_url_domain(cookie.get("domain"))
+                if not domain_groups.get(domain_key):
+                    domain_groups[domain_key] = [cookie]
+                else:
+                    domain_groups[domain_key].append(cookie)
+        # 返回错误
+        ret_cookies = {}
+        # 索引器
+        for domain, content_list in domain_groups.items():
+            if not content_list:
+                continue
+            # 只有cf的cookie过滤掉
+            cloudflare_cookie = True
+            for content in content_list:
+                if content["name"] != "cf_clearance":
+                    cloudflare_cookie = False
+                    break
+            if cloudflare_cookie:
+                continue
+            # 站点Cookie
+            cookie_str = ";".join(
+                [f"{content.get('name')}={content.get('value')}"
+                 for content in content_list
+                 if content.get("name") and content.get("name") not in self._ignore_cookies]
+            )
+            ret_cookies[domain] = cookie_str
+        return ret_cookies, ""
+
+    def _get_crypt_key(self) -> bytes:
+        """
+        使用UUID和密码生成CookieCloud的加解密密钥
+        """
+        md5_generator = md5()
+        md5_generator.update((str(self._key).strip() + '-' + str(self._password).strip()).encode('utf-8'))
+        return (md5_generator.hexdigest()[:16]).encode('utf-8')
+
+    def _load_local_encrypt_data(self, uuid: str) -> Dict[str, Any]:
+        file_path = self._local_path / f"{uuid}.json"
+        # 检查文件是否存在
+        if not file_path.exists():
+            return {}
+
+        # 读取文件
+        with open(file_path, encoding="utf-8", mode="r") as file:
+            read_content = file.read()
+        data = json.loads(read_content.encode("utf-8"))
+        return data

app/helper/doh.py

@@ -0,0 +1,156 @@
+"""
+doh函数的实现。
+author: https://github.com/C5H12O5/syno-videoinfo-plugin
+"""
+import base64
+import concurrent
+import concurrent.futures
+import json
+import socket
+import struct
+import urllib
+import urllib.request
+from typing import Dict, Optional
+
+from app.core.config import settings
+from app.log import logger
+
+# 定义一个全局集合来存储注册的主机
+_registered_hosts = {
+    'api.themoviedb.org',
+    'api.tmdb.org',
+    'webservice.fanart.tv',
+    'api.github.com',
+    'github.com',
+    'raw.githubusercontent.com',
+    'api.telegram.org'
+}
+
+# 定义一个全局线程池执行器
+_executor = concurrent.futures.ThreadPoolExecutor()
+
+# 定义默认的DoH配置
+_doh_timeout = 5
+_doh_cache: Dict[str, str] = {}
+_doh_resolvers = [
+    # https://developers.cloudflare.com/1.1.1.1/encryption/dns-over-https
+    "1.0.0.1",
+    "1.1.1.1",
+    # https://support.quad9.net/hc/en-us
+    "9.9.9.9",
+    "149.112.112.112"
+]
+
+
+def _patched_getaddrinfo(host, *args, **kwargs):
+    """
+    socket.getaddrinfo的补丁版本。
+    """
+    if host not in _registered_hosts:
+        return _orig_getaddrinfo(host, *args, **kwargs)
+
+    # 检查主机是否已解析
+    if host in _doh_cache:
+        ip = _doh_cache[host]
+        logger.info("已解析 [%s] 为 [%s] (缓存)", host, ip)
+        return _orig_getaddrinfo(ip, *args, **kwargs)
+
+    # 使用DoH解析主机
+    futures = []
+    for resolver in _doh_resolvers:
+        futures.append(_executor.submit(_doh_query, resolver, host))
+
+    for future in concurrent.futures.as_completed(futures):
+        ip = future.result()
+        if ip is not None:
+            logger.info("已解析 [%s] 为 [%s]", host, ip)
+            _doh_cache[host] = ip
+            host = ip
+            break
+
+    return _orig_getaddrinfo(host, *args, **kwargs)
+
+
+# 对 socket.getaddrinfo 进行补丁
+if settings.DOH_ENABLE:
+    _orig_getaddrinfo = socket.getaddrinfo
+    socket.getaddrinfo = _patched_getaddrinfo
+
+
+def _doh_query(resolver: str, host: str) -> Optional[str]:
+    """
+    使用给定的DoH解析器查询给定主机的IP地址。
+    """
+
+    # 构造DNS查询消息（RFC 1035）
+    header = b"".join(
+        [
+            b"\x00\x00",  # ID: 0
+            b"\x01\x00",  # FLAGS: 标准递归查询
+            b"\x00\x01",  # QDCOUNT: 1
+            b"\x00\x00",  # ANCOUNT: 0
+            b"\x00\x00",  # NSCOUNT: 0
+            b"\x00\x00",  # ARCOUNT: 0
+        ]
+    )
+    question = b"".join(
+        [
+            b"".join(
+                [
+                    struct.pack("B", len(item)) + item.encode("utf-8")
+                    for item in host.split(".")
+                ]
+            )
+            + b"\x00",  # QNAME: 域名序列
+            b"\x00\x01",  # QTYPE: A
+            b"\x00\x01",  # QCLASS: IN
+        ]
+    )
+    message = header + question
+
+    try:
+        # 发送GET请求到DoH解析器（RFC 8484）
+        b64message = base64.b64encode(message).decode("utf-8").rstrip("=")
+        url = f"https://{resolver}/dns-query?dns={b64message}"
+        headers = {"Content-Type": "application/dns-message"}
+        logger.debug("DoH请求: %s", url)
+
+        request = urllib.request.Request(url, headers=headers, method="GET")
+        with urllib.request.urlopen(request, timeout=_doh_timeout) as response:
+            logger.debug("解析器(%s)响应: %s", resolver, response.status)
+            if response.status != 200:
+                return None
+            resp_body = response.read()
+
+        # 解析DNS响应消息（RFC 1035）
+        # name（压缩）:2 + type:2 + class:2 + ttl:4 + rdlength:2 = 12字节
+        first_rdata_start = len(header) + len(question) + 12
+        # rdata（A记录）= 4字节
+        first_rdata_end = first_rdata_start + 4
+        # 将rdata转换为IP地址
+        return socket.inet_ntoa(resp_body[first_rdata_start:first_rdata_end])
+    except Exception as e:
+        logger.error("解析器(%s)请求错误: %s", resolver, e)
+        return None
+
+
+def doh_query_json(resolver: str, host: str) -> Optional[str]:
+    """
+    使用给定的DoH解析器查询给定主机的IP地址。
+    """
+    url = f"https://{resolver}/dns-query?name={host}&type=A"
+    headers = {"Accept": "application/dns-json"}
+    logger.debug("DoH请求: %s", url)
+    try:
+        request = urllib.request.Request(url, headers=headers, method="GET")
+        with urllib.request.urlopen(request, timeout=_doh_timeout) as response:
+            logger.debug("解析器(%s)响应: %s", resolver, response.status)
+            if response.status != 200:
+                return None
+            response_body = response.read().decode("utf-8")
+            logger.debug("<==  body: %s", response_body)
+            answer = json.loads(response_body)["Answer"]
+            return answer[0]["data"]
+    except Exception as e:
+        logger.error("解析器(%s)请求错误: %s", resolver, e)
+        return None

app/helper/message.py

@@ -1,19 +1,46 @@
+import json
 import queue
+import time
+from typing import Optional, Any, Union
 
 from app.utils.singleton import Singleton
 
 
 class MessageHelper(metaclass=Singleton):
     """
-    消息队列管理器
+    消息队列管理器，包括系统消息和用户消息
     """
     def __init__(self):
-        self.queue = queue.Queue()
+        self.sys_queue = queue.Queue()
+        self.user_queue = queue.Queue()
 
-    def put(self, message: str):
-        self.queue.put(message)
+    def put(self, message: Any, role: str = "sys", note: Union[list, dict] = None):
+        """
+        存消息
+        :param message: 消息
+        :param role: 消息通道 sys/user
+        :param note: 附件json
+        """
+        if role == "sys":
+            self.sys_queue.put(message)
+        else:
+            if isinstance(message, str):
+                self.user_queue.put(message)
+            elif hasattr(message, "to_dict"):
+                content = message.to_dict()
+                content['date'] = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())
+                content['note'] = json.dumps(note) if note else None
+                self.user_queue.put(json.dumps(content))
 
-    def get(self):
-        if not self.queue.empty():
-            return self.queue.get(block=False)
+    def get(self, role: str = "sys") -> Optional[str]:
+        """
+        取消息
+        :param role: 消息通道 sys/user
+        """
+        if role == "sys":
+            if not self.sys_queue.empty():
+                return self.sys_queue.get(block=False)
+        else:
+            if not self.user_queue.empty():
+                return self.user_queue.get(block=False)
         return None

app/helper/module.py

@@ -36,7 +36,7 @@ class ModuleHelper:
                     if isinstance(obj, type) and filter_func(name, obj):
                         submodules.append(obj)
             except Exception as err:
-                logger.error(f'加载模块 {package_name} 失败：{str(err)} - {traceback.format_exc()}')
+                logger.debug(f'加载模块 {package_name} 失败：{str(err)} - {traceback.format_exc()}')
 
         return submodules
 

app/helper/plugin.py

@@ -7,7 +7,9 @@ from typing import Dict, Tuple, Optional, List
 from cachetools import TTLCache, cached
 
 from app.core.config import settings
+from app.db.systemconfig_oper import SystemConfigOper
 from app.log import logger
+from app.schemas.types import SystemConfigKey
 from app.utils.http import RequestUtils
 from app.utils.singleton import Singleton
 from app.utils.system import SystemUtils
@@ -20,7 +22,19 @@ class PluginHelper(metaclass=Singleton):
 
     _base_url = "https://raw.githubusercontent.com/%s/%s/main/"
 
-    @cached(cache=TTLCache(maxsize=100, ttl=1800))
+    _install_reg = "https://movie-pilot.org/plugin/install/%s"
+
+    _install_report = "https://movie-pilot.org/plugin/install"
+
+    _install_statistic = "https://movie-pilot.org/plugin/statistic"
+
+    def __init__(self):
+        self.systemconfig = SystemConfigOper()
+        if not self.systemconfig.get(SystemConfigKey.PluginInstallReport):
+            if self.install_report():
+                self.systemconfig.set(SystemConfigKey.PluginInstallReport, "1")
+
+    @cached(cache=TTLCache(maxsize=1000, ttl=1800))
     def get_plugins(self, repo_url: str) -> Dict[str, dict]:
         """
         获取Github所有最新插件列表
@@ -61,6 +75,45 @@ class PluginHelper(metaclass=Singleton):
             return None, None
         return user, repo
 
+    @cached(cache=TTLCache(maxsize=1, ttl=1800))
+    def get_statistic(self) -> Dict:
+        """
+        获取插件安装统计
+        """
+        res = RequestUtils(timeout=10).get_res(self._install_statistic)
+        if res and res.status_code == 200:
+            return res.json()
+        return {}
+
+    def install_reg(self, pid: str) -> bool:
+        """
+        安装插件统计
+        """
+        if not pid:
+            return False
+        res = RequestUtils(timeout=5).get_res(self._install_reg % pid)
+        if res and res.status_code == 200:
+            return True
+        return False
+
+    def install_report(self) -> bool:
+        """
+        上报存量插件安装统计
+        """
+        plugins = self.systemconfig.get(SystemConfigKey.UserInstalledPlugins)
+        if not plugins:
+            return False
+        res = RequestUtils(content_type="application/json",
+                           timeout=5).post(self._install_report,
+                                           json={
+                                               "plugins": [
+                                                   {
+                                                       "plugin_id": plugin,
+                                                   } for plugin in plugins
+                                               ]
+                                           })
+        return True if res else False
+
     def install(self, pid: str, repo_url: str) -> Tuple[bool, str]:
         """
         安装插件
@@ -77,9 +130,11 @@ class PluginHelper(metaclass=Singleton):
             """
             获取插件的文件列表
             """
-            file_api = f"https://api.github.com/repos/{user}/{repo}/contents/plugins/{_p.lower()}"
+            file_api = f"https://api.github.com/repos/{user}/{repo}/contents/plugins/{_p}"
             r = RequestUtils(proxies=settings.PROXY, headers=settings.GITHUB_HEADERS, timeout=30).get_res(file_api)
-            if not r or r.status_code != 200:
+            if r is None:
+                return None, "连接仓库失败"
+            elif r.status_code != 200:
                 return None, f"连接仓库失败：{r.status_code} - {r.reason}"
             ret = r.json()
             if ret and ret[0].get("message") == "Not Found":
@@ -154,4 +209,7 @@ class PluginHelper(metaclass=Singleton):
         requirements_file = plugin_dir / "requirements.txt"
         if requirements_file.exists():
             SystemUtils.execute(f"pip install -r {requirements_file} > /dev/null 2>&1")
+        # 安装成功后统计
+        self.install_reg(pid)
+
         return True, ""

app/helper/resource.py

@@ -55,11 +55,7 @@ class ResourceHelper(metaclass=Singleton):
             target = resource.get("target")
             version = resource.get("version")
             # 判断平台
-            if platform and platform != SystemUtils.platform:
-                continue
-            # 判断本地是否存在
-            local_path = self._base_dir / target / rname
-            if not local_path.exists():
+            if platform and platform != SystemUtils.platform():
                 continue
             # 判断版本号
             if rtype == "auth":
@@ -80,8 +76,10 @@ class ResourceHelper(metaclass=Singleton):
             # 下载文件信息列表
             r = RequestUtils(proxies=settings.PROXY, headers=settings.GITHUB_HEADERS,
                              timeout=30).get_res(self._files_api)
-            if not r or r.status_code != 200:
+            if r and not r.ok:
                 return None, f"连接仓库失败：{r.status_code} - {r.reason}"
+            elif not r:
+                return None, "连接仓库失败"
             files_info = r.json()
             for item in files_info:
                 save_path = need_updates.get(item.get("name"))

app/helper/rss.py

@@ -225,7 +225,7 @@ class RssHelper:
     }
 
     @staticmethod
-    def parse(url, proxy: bool = False, timeout: int = 30) -> Union[List[dict], None]:
+    def parse(url, proxy: bool = False, timeout: int = 15) -> Union[List[dict], None]:
         """
         解析RSS订阅URL，获取RSS中的种子信息
         :param url: RSS地址

app/helper/torrent.py

@@ -326,8 +326,11 @@ class TorrentHelper(metaclass=Singleton):
             return True
 
         # 匹配内容
-        content = f"{torrent_info.title} {torrent_info.description} {' '.join(torrent_info.labels or [])}"
-        
+        content = (f"{torrent_info.title} "
+                   f"{torrent_info.description} "
+                   f"{' '.join(torrent_info.labels or [])} "
+                   f"{torrent_info.volume_factor}")
+
         # 最少做种人数
         min_seeders = filter_rule.get("min_seeders")
         if min_seeders and torrent_info.seeders < int(min_seeders):
@@ -399,3 +402,84 @@ class TorrentHelper(metaclass=Singleton):
                             f"{torrent_info.title} {StringUtils.str_filesize(torrent_info.size)} 不匹配大小规则 {size}")
                         return False
         return True
+
+    @staticmethod
+    def match_torrent(mediainfo: MediaInfo, torrent_meta: MetaInfo,
+                      torrent: TorrentInfo, logerror: bool = True) -> bool:
+        """
+        检查种子是否匹配媒体信息
+        :param mediainfo: 需要匹配的媒体信息
+        :param torrent_meta: 种子识别信息
+        :param torrent: 种子信息
+        :param logerror: 是否记录错误日志
+        """
+        # 要匹配的媒体标题、原标题
+        media_titles = {
+                           StringUtils.clear_upper(mediainfo.title),
+                           StringUtils.clear_upper(mediainfo.original_title)
+                       } - {""}
+        # 要匹配的媒体别名、译名
+        media_names = {StringUtils.clear_upper(name) for name in mediainfo.names if name}
+        # 识别的种子中英文名
+        meta_names = {
+                         StringUtils.clear_upper(torrent_meta.cn_name),
+                         StringUtils.clear_upper(torrent_meta.en_name)
+                     } - {""}
+        # 比对种子识别类型
+        if torrent_meta.type == MediaType.TV and mediainfo.type != MediaType.TV:
+            if logerror:
+                logger.warn(f'{torrent.site_name} - {torrent.title} 种子标题类型为 {torrent_meta.type.value}，'
+                            f'不匹配 {mediainfo.type.value}')
+            return False
+        # 比对种子在站点中的类型
+        if torrent.category == MediaType.TV.value and mediainfo.type != MediaType.TV:
+            if logerror:
+                logger.warn(f'{torrent.site_name} - {torrent.title} 种子在站点中归类为 {torrent.category}，'
+                            f'不匹配 {mediainfo.type.value}')
+            return False
+        # 比对年份
+        if mediainfo.year:
+            if mediainfo.type == MediaType.TV:
+                # 剧集年份，每季的年份可能不同
+                if torrent_meta.year and torrent_meta.year not in [year for year in
+                                                                   mediainfo.season_years.values()]:
+                    if logerror:
+                        logger.warn(f'{torrent.site_name} - {torrent.title} 年份不匹配 {mediainfo.season_years}')
+                    return False
+            else:
+                # 电影年份，上下浮动1年
+                if torrent_meta.year not in [str(int(mediainfo.year) - 1),
+                                             mediainfo.year,
+                                             str(int(mediainfo.year) + 1)]:
+                    if logerror:
+                        logger.warn(f'{torrent.site_name} - {torrent.title} 年份不匹配 {mediainfo.year}')
+                    return False
+        # 比对标题和原语种标题
+        if meta_names.intersection(media_titles):
+            logger.info(f'{mediainfo.title} 通过标题匹配到资源：{torrent.site_name} - {torrent.title}')
+            return True
+        # 比对别名和译名
+        if media_names:
+            if meta_names.intersection(media_names):
+                logger.info(f'{mediainfo.title} 通过别名或译名匹配到资源：{torrent.site_name} - {torrent.title}')
+                return True
+        # 标题拆分
+        if torrent_meta.org_string:
+            titles = [StringUtils.clear_upper(t) for t in re.split(r'[\s/【】.\[\]\-]+',
+                                                                   torrent_meta.org_string) if t]
+            # 在标题中判断是否存在标题、原语种标题
+            if media_titles.intersection(titles):
+                logger.info(f'{mediainfo.title} 通过标题匹配到资源：{torrent.site_name} - {torrent.title}')
+                return True
+        # 在副标题中判断是否存在标题、原语种标题、别名、译名
+        if torrent.description:
+            subtitles = {StringUtils.clear_upper(t) for t in re.split(r'[\s/|]+',
+                                                                      torrent.description) if t}
+            if media_titles.intersection(subtitles) or media_names.intersection(subtitles):
+                logger.info(f'{mediainfo.title} 通过副标题匹配到资源：{torrent.site_name} - {torrent.title}，'
+                            f'副标题：{torrent.description}')
+                return True
+        # 未匹配
+        if logerror:
+            logger.warn(f'{torrent.site_name} - {torrent.title} 标题不匹配，识别名称：{meta_names}')
+        return False

app/main.py

@@ -53,10 +53,13 @@ def init_routers():
     """
     from app.api.apiv1 import api_router
     from app.api.servarr import arr_router
+    from app.api.servcookie import cookie_router
     # API路由
     App.include_router(api_router, prefix=settings.API_V1_STR)
     # Radarr、Sonarr路由
     App.include_router(arr_router, prefix="/api/v3")
+    # CookieCloud路由
+    App.include_router(cookie_router, prefix="/cookiecloud")
 
 
 def start_frontend():
@@ -192,8 +195,10 @@ def start_module():
     ResourceHelper()
     # 加载模块
     ModuleManager()
+    # 安装在线插件
+    PluginManager().install_online_plugin()
     # 加载插件
-    PluginManager()
+    PluginManager().start()
     # 启动定时服务
     Scheduler()
     # 启动事件消费

app/modules/bangumi/__init__.py

@@ -0,0 +1,93 @@
+from typing import List, Optional, Tuple, Union
+
+from app.core.context import MediaInfo
+from app.log import logger
+from app.modules import _ModuleBase
+from app.modules.bangumi.bangumi import BangumiApi
+from app.utils.http import RequestUtils
+
+
+class BangumiModule(_ModuleBase):
+    bangumiapi: BangumiApi = None
+
+    def init_module(self) -> None:
+        self.bangumiapi = BangumiApi()
+
+    def stop(self):
+        pass
+
+    def test(self) -> Tuple[bool, str]:
+        """
+        测试模块连接性
+        """
+        with RequestUtils().get_res("https://api.bgm.tv/") as ret:
+            if ret and ret.status_code == 200:
+                return True, ""
+            elif ret:
+                return False, f"无法连接Bangumi，错误码：{ret.status_code}"
+        return False, "Bangumi网络连接失败"
+
+    def init_setting(self) -> Tuple[str, Union[str, bool]]:
+        pass
+
+    def recognize_media(self, bangumiid: int = None,
+                        **kwargs) -> Optional[MediaInfo]:
+        """
+        识别媒体信息
+        :param bangumiid: 识别的Bangumi ID
+        :return: 识别的媒体信息，包括剧集信息
+        """
+        if not bangumiid:
+            return None
+
+        # 直接查询详情
+        info = self.bangumi_info(bangumiid=bangumiid)
+        if info:
+            # 赋值TMDB信息并返回
+            mediainfo = MediaInfo(bangumi_info=info)
+            logger.info(f"{bangumiid} Bangumi识别结果：{mediainfo.type.value} "
+                        f"{mediainfo.title_year}")
+            return mediainfo
+        else:
+            logger.info(f"{bangumiid} 未匹配到Bangumi媒体信息")
+
+        return None
+
+    def bangumi_info(self, bangumiid: int) -> Optional[dict]:
+        """
+        获取Bangumi信息
+        :param bangumiid: BangumiID
+        :return: Bangumi信息
+        """
+        if not bangumiid:
+            return None
+        logger.info(f"开始获取Bangumi信息：{bangumiid} ...")
+        return self.bangumiapi.detail(bangumiid)
+
+    def bangumi_calendar(self, page: int = 1, count: int = 30) -> Optional[List[dict]]:
+        """
+        获取Bangumi每日放送
+        :param page:  页码
+        :param count:  每页数量
+        """
+        return self.bangumiapi.calendar(page, count)
+
+    def bangumi_credits(self, bangumiid: int, page: int = 1, count: int = 20) -> List[dict]:
+        """
+        根据TMDBID查询电影演职员表
+        :param bangumiid:  BangumiID
+        :param page:  页码
+        :param count:  数量
+        """
+        persons = self.bangumiapi.persons(bangumiid) or []
+        if persons:
+            return persons[(page - 1) * count: page * count]
+        else:
+            return []
+
+    def bangumi_recommend(self, bangumiid: int) -> List[dict]:
+        """
+        根据BangumiID查询推荐电影
+        :param bangumiid:  BangumiID
+        """
+        return self.bangumiapi.subjects(bangumiid) or []

app/modules/bangumi/bangumi.py

@@ -0,0 +1,165 @@
+from datetime import datetime
+from functools import lru_cache
+
+import requests
+
+from app.utils.http import RequestUtils
+
+
+class BangumiApi(object):
+    """
+    https://bangumi.github.io/api/
+    """
+
+    _urls = {
+        "calendar": "calendar",
+        "detail": "v0/subjects/%s",
+        "persons": "v0/subjects/%s/persons",
+        "subjects": "v0/subjects/%s/subjects",
+        "characters": "v0/subjects/%s/characters"
+    }
+    _base_url = "https://api.bgm.tv/"
+    _req = RequestUtils(session=requests.Session())
+
+    def __init__(self):
+        pass
+
+    @classmethod
+    @lru_cache(maxsize=128)
+    def __invoke(cls, url, **kwargs):
+        req_url = cls._base_url + url
+        params = {}
+        if kwargs:
+            params.update(kwargs)
+        resp = cls._req.get_res(url=req_url, params=params)
+        try:
+            return resp.json() if resp else None
+        except Exception as e:
+            print(e)
+            return None
+
+    def calendar(self, page: int = 1, count: int = 30):
+        """
+        获取每日放送，返回items
+        """
+        """
+        [
+          {
+            "weekday": {
+              "en": "Mon",
+              "cn": "星期一",
+              "ja": "月耀日",
+              "id": 1
+            },
+            "items": [
+              {
+                "id": 350235,
+                "url": "http://bgm.tv/subject/350235",
+                "type": 2,
+                "name": "月が導く異世界道中 第二幕",
+                "name_cn": "月光下的异世界之旅 第二幕",
+                "summary": "",
+                "air_date": "2024-01-08",
+                "air_weekday": 1,
+                "rating": {
+                  "total": 257,
+                  "count": {
+                    "1": 1,
+                    "2": 1,
+                    "3": 4,
+                    "4": 15,
+                    "5": 51,
+                    "6": 111,
+                    "7": 49,
+                    "8": 13,
+                    "9": 5,
+                    "10": 7
+                  },
+                  "score": 6.1
+                },
+                "rank": 6125,
+                "images": {
+                  "large": "http://lain.bgm.tv/pic/cover/l/3c/a5/350235_A0USf.jpg",
+                  "common": "http://lain.bgm.tv/pic/cover/c/3c/a5/350235_A0USf.jpg",
+                  "medium": "http://lain.bgm.tv/pic/cover/m/3c/a5/350235_A0USf.jpg",
+                  "small": "http://lain.bgm.tv/pic/cover/s/3c/a5/350235_A0USf.jpg",
+                  "grid": "http://lain.bgm.tv/pic/cover/g/3c/a5/350235_A0USf.jpg"
+                },
+                "collection": {
+                  "doing": 920
+                }
+              },
+              {
+                "id": 358561,
+                "url": "http://bgm.tv/subject/358561",
+                "type": 2,
+                "name": "大宇宙时代",
+                "name_cn": "大宇宙时代",
+                "summary": "",
+                "air_date": "2024-01-22",
+                "air_weekday": 1,
+                "rating": {
+                  "total": 2,
+                  "count": {
+                    "1": 0,
+                    "2": 0,
+                    "3": 0,
+                    "4": 0,
+                    "5": 1,
+                    "6": 1,
+                    "7": 0,
+                    "8": 0,
+                    "9": 0,
+                    "10": 0
+                  },
+                  "score": 5.5
+                },
+                "images": {
+                  "large": "http://lain.bgm.tv/pic/cover/l/71/66/358561_UzsLu.jpg",
+                  "common": "http://lain.bgm.tv/pic/cover/c/71/66/358561_UzsLu.jpg",
+                  "medium": "http://lain.bgm.tv/pic/cover/m/71/66/358561_UzsLu.jpg",
+                  "small": "http://lain.bgm.tv/pic/cover/s/71/66/358561_UzsLu.jpg",
+                  "grid": "http://lain.bgm.tv/pic/cover/g/71/66/358561_UzsLu.jpg"
+                },
+                "collection": {
+                  "doing": 9
+                }
+              }
+            ]
+          }
+        ]
+        """
+        ret_list = []
+        result = self.__invoke(self._urls["calendar"], _ts=datetime.strftime(datetime.now(), '%Y%m%d'))
+        if result:
+            for item in result:
+                ret_list.extend(item.get("items") or [])
+        return ret_list[(page - 1) * count: page * count]
+
+    def detail(self, bid: int):
+        """
+        获取番剧详情
+        """
+        return self.__invoke(self._urls["detail"] % bid, _ts=datetime.strftime(datetime.now(), '%Y%m%d'))
+
+    def persons(self, bid: int):
+        """
+        获取番剧人物
+        """
+        ret_list = []
+        result = self.__invoke(self._urls["characters"] % bid, _ts=datetime.strftime(datetime.now(), '%Y%m%d'))
+        if result:
+            for item in result:
+                character_id = item.get("id")
+                actors = item.get("actors")
+                if character_id and actors and actors[0]:
+                    actor_info = actors[0]
+                    actor_info.update({'career': [item.get('name')]})
+                    ret_list.append(actor_info)
+        return ret_list
+
+    def subjects(self, bid: int):
+        """
+        获取关联条目信息
+        """
+        return self.__invoke(self._urls["subjects"] % bid, _ts=datetime.strftime(datetime.now(), '%Y%m%d'))

app/modules/douban/__init__.py

@@ -2,10 +2,12 @@ import re
 from pathlib import Path
 from typing import List, Optional, Tuple, Union
 
+import cn2an
+
 from app.core.config import settings
 from app.core.context import MediaInfo
 from app.core.meta import MetaBase
-from app.core.metainfo import MetaInfo
+from app.core.metainfo import MetaInfo, MetaInfoPath
 from app.log import logger
 from app.modules import _ModuleBase
 from app.modules.douban.apiv2 import DoubanApi
@@ -28,17 +30,17 @@ class DoubanModule(_ModuleBase):
         self.cache = DoubanCache()
 
     def stop(self):
-        pass
+        self.doubanapi.close()
 
     def test(self) -> Tuple[bool, str]:
         """
         测试模块连接性
         """
-        ret = RequestUtils().get_res("https://movie.douban.com/")
-        if ret and ret.status_code == 200:
-            return True, ""
-        elif ret:
-            return False, f"无法连接豆瓣，错误码：{ret.status_code}"
+        with RequestUtils().get_res("https://movie.douban.com/") as ret:
+            if ret and ret.status_code == 200:
+                return True, ""
+            elif ret:
+                return False, f"无法连接豆瓣，错误码：{ret.status_code}"
         return False, "豆瓣网络连接失败"
 
     def init_setting(self) -> Tuple[str, Union[str, bool]]:
@@ -57,48 +59,59 @@ class DoubanModule(_ModuleBase):
         :param cache:    是否使用缓存
         :return: 识别的媒体信息，包括剧集信息
         """
-        if settings.RECOGNIZE_SOURCE != "douban":
+        if not doubanid and not meta:
+            return None
+
+        if meta and not doubanid \
+                and settings.RECOGNIZE_SOURCE != "douban":
             return None
 
         if not meta:
+            # 未提供元数据时，直接查询豆瓣信息，不使用缓存
             cache_info = {}
         elif not meta.name:
             logger.error("识别媒体信息时未提供元数据名称")
             return None
         else:
+            # 读取缓存
             if mtype:
                 meta.type = mtype
             if doubanid:
                 meta.doubanid = doubanid
-            # 读取缓存
             cache_info = self.cache.get(meta)
+
+        # 识别豆瓣信息
         if not cache_info or not cache:
             # 缓存没有或者强制不使用缓存
             if doubanid:
                 # 直接查询详情
                 info = self.douban_info(doubanid=doubanid, mtype=mtype or meta.type)
             elif meta:
-                if meta.begin_season:
-                    logger.info(f"正在识别 {meta.name} 第{meta.begin_season}季 ...")
-                else:
-                    logger.info(f"正在识别 {meta.name} ...")
-                # 匹配豆瓣信息
-                match_info = self.match_doubaninfo(name=meta.name,
-                                                   mtype=mtype or meta.type,
-                                                   year=meta.year,
-                                                   season=meta.begin_season)
-                if match_info:
-                    # 匹配到豆瓣信息
-                    info = self.douban_info(
-                        doubanid=match_info.get("id"),
-                        mtype=mtype or meta.type
-                    )
-                else:
-                    logger.info(f"{meta.name if meta else doubanid} 未匹配到豆瓣媒体信息")
-                    return None
+                info = {}
+                # 使用中英文名分别识别，去重去空，但要保持顺序
+                names = list(dict.fromkeys([k for k in [meta.cn_name, meta.en_name] if k]))
+                for name in names:
+                    if meta.begin_season:
+                        logger.info(f"正在识别 {name} 第{meta.begin_season}季 ...")
+                    else:
+                        logger.info(f"正在识别 {name} ...")
+                    # 匹配豆瓣信息
+                    match_info = self.match_doubaninfo(name=name,
+                                                       mtype=mtype or meta.type,
+                                                       year=meta.year,
+                                                       season=meta.begin_season)
+                    if match_info:
+                        # 匹配到豆瓣信息
+                        info = self.douban_info(
+                            doubanid=match_info.get("id"),
+                            mtype=mtype or meta.type
+                        )
+                        if info:
+                            break
             else:
                 logger.error("识别媒体信息时未提供元数据或豆瓣ID")
                 return None
+
             # 保存到缓存
             if meta and cache:
                 self.cache.update(meta, info)
@@ -540,7 +553,14 @@ class DoubanModule(_ModuleBase):
             if item_obj.get("type_name") not in (MediaType.TV.value, MediaType.MOVIE.value):
                 continue
             ret_medias.append(MediaInfo(douban_info=item_obj.get("target")))
-
+        # 将搜索词中的季写入标题中
+        if ret_medias and meta.begin_season:
+            # 小写数据转大写
+            season_str = cn2an.an2cn(meta.begin_season, "low")
+            for media in ret_medias:
+                if media.type == MediaType.TV:
+                    media.title = f"{media.title} 第{season_str}季"
+                    media.season = meta.begin_season
         return ret_medias
 
     @retry(Exception, 5, 3, 3, logger=logger)
@@ -609,53 +629,83 @@ class DoubanModule(_ModuleBase):
         return infos.get("subject_collection_items")
 
     def scrape_metadata(self, path: Path, mediainfo: MediaInfo, transfer_type: str,
-                        force_nfo: bool = False, force_img: bool = False) -> None:
+                        metainfo: MetaBase = None, force_nfo: bool = False, force_img: bool = False) -> None:
         """
         刮削元数据
         :param path: 媒体文件路径
         :param mediainfo:  识别的媒体信息
         :param transfer_type: 传输类型
+        :param metainfo: 源文件的识别元数据
         :param force_nfo: 是否强制刮削nfo
         :param force_img: 是否强制刮削图片
         :return: 成功或失败
         """
+
+        def __get_mediainfo(_meta: MetaBase, _mediainfo: MediaInfo) -> Optional[MediaInfo]:
+            """
+            获取豆瓣媒体信息
+            """
+            if not _meta.name:
+                return None
+            # 查询豆瓣详情
+            if not _mediainfo.douban_id:
+                # 根据TMDB名称查询豆瓣数据
+                _doubaninfo = self.match_doubaninfo(name=_mediainfo.title,
+                                                    imdbid=_mediainfo.imdb_id,
+                                                    mtype=_mediainfo.type,
+                                                    year=_mediainfo.year)
+                if not _doubaninfo:
+                    logger.warn(f"未找到 {_mediainfo.title} 的豆瓣信息")
+                    return None
+                _doubaninfo = self.douban_info(doubanid=_doubaninfo.get("id"), mtype=_mediainfo.type)
+            else:
+                _doubaninfo = self.douban_info(doubanid=_mediainfo.douban_id,
+                                               mtype=_mediainfo.type)
+            if not _doubaninfo:
+                logger(f"未获取到 {_mediainfo.douban_id} 的豆瓣媒体信息，无法刮削！")
+                return None
+            # 豆瓣媒体信息
+            _doubanmedia = MediaInfo(douban_info=_doubaninfo)
+            # 补充图片
+            self.obtain_images(_doubanmedia)
+            return _doubanmedia
+
         if settings.SCRAP_SOURCE != "douban":
             return None
         if SystemUtils.is_bluray_dir(path):
             # 蓝光原盘
             logger.info(f"开始刮削蓝光原盘：{path} ...")
-            meta = MetaInfo(path.stem)
-            if not meta.name:
-                return
-            # 查询豆瓣详情
-            if not mediainfo.douban_id:
-                # 根据名称查询豆瓣数据
-                doubaninfo = self.match_doubaninfo(name=mediainfo.title,
-                                                   imdbid=mediainfo.imdb_id,
-                                                   mtype=mediainfo.type,
-                                                   year=mediainfo.year)
-                if not doubaninfo:
-                    logger.warn(f"未找到 {mediainfo.title} 的豆瓣信息")
-                    return
-                doubaninfo = self.douban_info(doubanid=doubaninfo.get("id"), mtype=mediainfo.type)
-            else:
-                doubaninfo = self.douban_info(doubanid=mediainfo.douban_id,
-                                              mtype=mediainfo.type)
-            if not doubaninfo:
-                logger(f"未获取到 {mediainfo.douban_id} 的豆瓣媒体信息，无法刮削！")
-                return
-            # 豆瓣媒体信息
-            mediainfo = MediaInfo(douban_info=doubaninfo)
-            # 补充图片
-            self.obtain_images(mediainfo)
+            # 优先使用传入metainfo
+            meta = metainfo or MetaInfo(path.name)
             # 刮削路径
             scrape_path = path / path.name
+            # 媒体信息
+            doubanmedia = __get_mediainfo(_meta=meta, _mediainfo=mediainfo)
+            if not doubanmedia:
+                return
+            # 刮削
             self.scraper.gen_scraper_files(meta=meta,
-                                           mediainfo=mediainfo,
+                                           mediainfo=doubanmedia,
                                            file_path=scrape_path,
                                            transfer_type=transfer_type,
                                            force_nfo=force_nfo,
                                            force_img=force_img)
+        elif path.is_file():
+            # 刮削单个文件
+            logger.info(f"开始刮削媒体库文件：{path} ...")
+            # 优先使用传入metainfo
+            meta = metainfo or MetaInfoPath(path)
+            # 媒体信息
+            doubanmedia = __get_mediainfo(_meta=meta, _mediainfo=mediainfo)
+            if not doubanmedia:
+                return
+            # 刮削
+            self.scraper.gen_scraper_files(meta=meta,
+                                           mediainfo=doubanmedia,
+                                           file_path=path,
+                                           transfer_type=transfer_type,
+                                           force_nfo=force_nfo,
+                                           force_img=force_img)
         else:
             # 目录下的所有文件
             for file in SystemUtils.list_files(path, settings.RMT_MEDIAEXT):
@@ -663,34 +713,14 @@ class DoubanModule(_ModuleBase):
                     continue
                 logger.info(f"开始刮削媒体库文件：{file} ...")
                 try:
-                    meta = MetaInfo(file.stem)
-                    if not meta.name:
-                        continue
-                    if not mediainfo.douban_id:
-                        # 根据名称查询豆瓣数据
-                        doubaninfo = self.match_doubaninfo(name=mediainfo.title,
-                                                           imdbid=mediainfo.imdb_id,
-                                                           mtype=mediainfo.type,
-                                                           year=mediainfo.year,
-                                                           season=meta.begin_season)
-                        if not doubaninfo:
-                            logger.warn(f"未找到 {mediainfo.title} 的豆瓣信息")
-                            break
-                        # 查询豆瓣详情
-                        doubaninfo = self.douban_info(doubanid=doubaninfo.get("id"), mtype=mediainfo.type)
-                    else:
-                        doubaninfo = self.douban_info(doubanid=mediainfo.douban_id,
-                                                      mtype=mediainfo.type)
-                    if not doubaninfo:
-                        logger(f"未获取到 {mediainfo.douban_id} 的豆瓣媒体信息，无法刮削！")
-                        continue
+                    meta = MetaInfoPath(file)
                     # 豆瓣媒体信息
-                    mediainfo = MediaInfo(douban_info=doubaninfo)
-                    # 补充图片
-                    self.obtain_images(mediainfo)
+                    doubanmedia = __get_mediainfo(_meta=meta, _mediainfo=mediainfo)
+                    if not doubanmedia:
+                        return
                     # 刮削
                     self.scraper.gen_scraper_files(meta=meta,
-                                                   mediainfo=mediainfo,
+                                                   mediainfo=doubanmedia,
                                                    file_path=file,
                                                    transfer_type=transfer_type,
                                                    force_nfo=force_nfo,

app/modules/douban/apiv2.py

@@ -210,7 +210,7 @@ class DoubanApi(metaclass=Singleton):
             },
             data={
                 "apikey": "0ab215a8b1977939201640fa14c66bab",
-            },
+            }
         )
         """
         req_url = self._api_url + url
@@ -481,6 +481,6 @@ class DoubanApi(metaclass=Singleton):
         """
         self.__invoke.cache_clear()
 
-    def __del__(self):
+    def close(self):
         if self._session:
             self._session.close()

app/modules/douban/scraper.py

@@ -1,4 +1,3 @@
-import time
 from pathlib import Path
 from typing import Union
 from xml.dom import minidom
@@ -31,6 +30,9 @@ class DoubanScraper:
         :param force_img: 强制生成图片
         """
 
+        if not mediainfo or not file_path:
+            return
+
         self._transfer_type = transfer_type
         self._force_nfo = force_nfo
         self._force_img = force_img
@@ -83,10 +85,6 @@ class DoubanScraper:
 
     @staticmethod
     def __gen_common_nfo(mediainfo: MediaInfo, doc, root):
-        # 添加时间
-        DomUtils.add_node(doc, root, "dateadded",
-                          time.strftime('%Y-%m-%d %H:%M:%S',
-                                        time.localtime(time.time())))
         # 简介
         xplot = DomUtils.add_node(doc, root, "plot")
         xplot.appendChild(doc.createCDATASection(mediainfo.overview or ""))
@@ -166,8 +164,6 @@ class DoubanScraper:
         logger.info(f"正在生成季NFO文件：{season_path.name}")
         doc = minidom.Document()
         root = DomUtils.add_node(doc, doc, "season")
-        # 添加时间
-        DomUtils.add_node(doc, root, "dateadded", time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(time.time())))
         # 简介
         xplot = DomUtils.add_node(doc, root, "plot")
         xplot.appendChild(doc.createCDATASection(mediainfo.overview or ""))
@@ -197,15 +193,15 @@ class DoubanScraper:
                 url = url.replace("/format/webp", "/format/jpg")
                 file_path.with_suffix(".jpg")
             logger.info(f"正在下载{file_path.stem}图片：{url} ...")
-            r = RequestUtils().get_res(url=url)
-            if r:
-                if self._transfer_type in ['rclone_move', 'rclone_copy']:
-                    self.__save_remove_file(file_path, r.content)
+            with RequestUtils().get_res(url=url) as r:
+                if r:
+                    if self._transfer_type in ['rclone_move', 'rclone_copy']:
+                        self.__save_remove_file(file_path, r.content)
+                    else:
+                        file_path.write_bytes(r.content)
+                    logger.info(f"图片已保存：{file_path}")
                 else:
-                    file_path.write_bytes(r.content)
-                logger.info(f"图片已保存：{file_path}")
-            else:
-                logger.info(f"{file_path.stem}图片下载失败，请检查网络连通性")
+                    logger.info(f"{file_path.stem}图片下载失败，请检查网络连通性")
         except Exception as err:
             logger.error(f"{file_path.stem}图片下载失败：{str(err)}")
 

app/modules/emby/emby.py

@@ -56,12 +56,12 @@ class Emby:
             return []
         req_url = "%semby/Library/SelectableMediaFolders?api_key=%s" % (self._host, self._apikey)
         try:
-            res = RequestUtils().get_res(req_url)
-            if res:
-                return res.json()
-            else:
-                logger.error(f"Library/SelectableMediaFolders 未获取到返回数据")
-                return []
+            with RequestUtils().get_res(req_url) as res:
+                if res:
+                    return res.json()
+                else:
+                    logger.error(f"Library/SelectableMediaFolders 未获取到返回数据")
+                    return []
         except Exception as e:
             logger.error(f"连接Library/SelectableMediaFolders 出错：" + str(e))
             return []
@@ -74,29 +74,29 @@ class Emby:
             return []
         req_url = "%semby/Library/VirtualFolders/Query?api_key=%s" % (self._host, self._apikey)
         try:
-            res = RequestUtils().get_res(req_url)
-            if res:
-                library_items = res.json().get("Items")
-                librarys = []
-                for library_item in library_items:
-                    library_name = library_item.get('Name')
-                    pathInfos = library_item.get('LibraryOptions', {}).get('PathInfos')
-                    library_paths = []
-                    for path in pathInfos:
-                        if path.get('NetworkPath'):
-                            library_paths.append(path.get('NetworkPath'))
-                        else:
-                            library_paths.append(path.get('Path'))
+            with RequestUtils().get_res(req_url) as res:
+                if res:
+                    library_items = res.json().get("Items")
+                    librarys = []
+                    for library_item in library_items:
+                        library_name = library_item.get('Name')
+                        pathInfos = library_item.get('LibraryOptions', {}).get('PathInfos')
+                        library_paths = []
+                        for path in pathInfos:
+                            if path.get('NetworkPath'):
+                                library_paths.append(path.get('NetworkPath'))
+                            else:
+                                library_paths.append(path.get('Path'))
 
-                    if library_name and library_paths:
-                        librarys.append({
-                            'Name': library_name,
-                            'Path': library_paths
-                        })
-                return librarys
-            else:
-                logger.error(f"Library/VirtualFolders/Query 未获取到返回数据")
-                return []
+                        if library_name and library_paths:
+                            librarys.append({
+                                'Name': library_name,
+                                'Path': library_paths
+                            })
+                    return librarys
+                else:
+                    logger.error(f"Library/VirtualFolders/Query 未获取到返回数据")
+                    return []
         except Exception as e:
             logger.error(f"连接Library/VirtualFolders/Query 出错：" + str(e))
             return []
@@ -113,12 +113,12 @@ class Emby:
             user = self.user
         req_url = f"{self._host}emby/Users/{user}/Views?api_key={self._apikey}"
         try:
-            res = RequestUtils().get_res(req_url)
-            if res:
-                return res.json().get("Items")
-            else:
-                logger.error(f"User/Views 未获取到返回数据")
-                return []
+            with RequestUtils().get_res(req_url) as res:
+                if res:
+                    return res.json().get("Items")
+                else:
+                    logger.error(f"User/Views 未获取到返回数据")
+                    return []
         except Exception as e:
             logger.error(f"连接User/Views 出错：" + str(e))
             return []
@@ -164,20 +164,20 @@ class Emby:
             return None
         req_url = "%sUsers?api_key=%s" % (self._host, self._apikey)
         try:
-            res = RequestUtils().get_res(req_url)
-            if res:
-                users = res.json()
-                # 先查询是否有与当前用户名称匹配的
-                if user_name:
+            with RequestUtils().get_res(req_url) as res:
+                if res:
+                    users = res.json()
+                    # 先查询是否有与当前用户名称匹配的
+                    if user_name:
+                        for user in users:
+                            if user.get("Name") == user_name:
+                                return user.get("Id")
+                    # 查询管理员
                     for user in users:
-                        if user.get("Name") == user_name:
+                        if user.get("Policy", {}).get("IsAdministrator"):
                             return user.get("Id")
-                # 查询管理员
-                for user in users:
-                    if user.get("Policy", {}).get("IsAdministrator"):
-                        return user.get("Id")
-            else:
-                logger.error(f"Users 未获取到返回数据")
+                else:
+                    logger.error(f"Users 未获取到返回数据")
         except Exception as e:
             logger.error(f"连接Users出错：" + str(e))
         return None
@@ -227,11 +227,11 @@ class Emby:
             return None
         req_url = "%sSystem/Info?api_key=%s" % (self._host, self._apikey)
         try:
-            res = RequestUtils().get_res(req_url)
-            if res:
-                return res.json().get("Id")
-            else:
-                logger.error(f"System/Info 未获取到返回数据")
+            with RequestUtils().get_res(req_url) as res:
+                if res:
+                    return res.json().get("Id")
+                else:
+                    logger.error(f"System/Info 未获取到返回数据")
         except Exception as e:
 
             logger.error(f"连接System/Info出错：" + str(e))
@@ -245,12 +245,12 @@ class Emby:
             return 0
         req_url = "%semby/Users/Query?api_key=%s" % (self._host, self._apikey)
         try:
-            res = RequestUtils().get_res(req_url)
-            if res:
-                return res.json().get("TotalRecordCount")
-            else:
-                logger.error(f"Users/Query 未获取到返回数据")
-                return 0
+            with RequestUtils().get_res(req_url) as res:
+                if res:
+                    return res.json().get("TotalRecordCount")
+                else:
+                    logger.error(f"Users/Query 未获取到返回数据")
+                    return 0
         except Exception as e:
             logger.error(f"连接Users/Query出错：" + str(e))
             return 0
@@ -264,17 +264,17 @@ class Emby:
             return schemas.Statistic()
         req_url = "%semby/Items/Counts?api_key=%s" % (self._host, self._apikey)
         try:
-            res = RequestUtils().get_res(req_url)
-            if res:
-                result = res.json()
-                return schemas.Statistic(
-                    movie_count=result.get("MovieCount") or 0,
-                    tv_count=result.get("SeriesCount") or 0,
-                    episode_count=result.get("EpisodeCount") or 0
-                )
-            else:
-                logger.error(f"Items/Counts 未获取到返回数据")
-                return schemas.Statistic()
+            with RequestUtils().get_res(req_url) as res:
+                if res:
+                    result = res.json()
+                    return schemas.Statistic(
+                        movie_count=result.get("MovieCount") or 0,
+                        tv_count=result.get("SeriesCount") or 0,
+                        episode_count=result.get("EpisodeCount") or 0
+                    )
+                else:
+                    logger.error(f"Items/Counts 未获取到返回数据")
+                    return schemas.Statistic()
         except Exception as e:
             logger.error(f"连接Items/Counts出错：" + str(e))
             return schemas.Statistic()
@@ -299,14 +299,14 @@ class Emby:
                    "&api_key=%s") % (
                       self._host, name, self._apikey)
         try:
-            res = RequestUtils().get_res(req_url)
-            if res:
-                res_items = res.json().get("Items")
-                if res_items:
-                    for res_item in res_items:
-                        if res_item.get('Name') == name and (
-                                not year or str(res_item.get('ProductionYear')) == str(year)):
-                            return res_item.get('Id')
+            with RequestUtils().get_res(req_url) as res:
+                if res:
+                    res_items = res.json().get("Items")
+                    if res_items:
+                        for res_item in res_items:
+                            if res_item.get('Name') == name and (
+                                    not year or str(res_item.get('ProductionYear')) == str(year)):
+                                return res_item.get('Id')
         except Exception as e:
             logger.error(f"连接Items出错：" + str(e))
             return None
@@ -329,36 +329,36 @@ class Emby:
                   "&Recursive=true&SearchTerm=%s&Limit=10&IncludeSearchTypes=false&api_key=%s" % (
                       self._host, title, self._apikey)
         try:
-            res = RequestUtils().get_res(req_url)
-            if res:
-                res_items = res.json().get("Items")
-                if res_items:
-                    ret_movies = []
-                    for res_item in res_items:
-                        item_tmdbid = res_item.get("ProviderIds", {}).get("Tmdb")
-                        mediaserver_item = schemas.MediaServerItem(
-                            server="emby",
-                            library=res_item.get("ParentId"),
-                            item_id=res_item.get("Id"),
-                            item_type=res_item.get("Type"),
-                            title=res_item.get("Name"),
-                            original_title=res_item.get("OriginalTitle"),
-                            year=res_item.get("ProductionYear"),
-                            tmdbid=int(item_tmdbid) if item_tmdbid else None,
-                            imdbid=res_item.get("ProviderIds", {}).get("Imdb"),
-                            tvdbid=res_item.get("ProviderIds", {}).get("Tvdb"),
-                            path=res_item.get("Path")
-                        )
-                        if tmdb_id and item_tmdbid:
-                            if str(item_tmdbid) != str(tmdb_id):
-                                continue
-                            else:
+            with RequestUtils().get_res(req_url) as res:
+                if res:
+                    res_items = res.json().get("Items")
+                    if res_items:
+                        ret_movies = []
+                        for res_item in res_items:
+                            item_tmdbid = res_item.get("ProviderIds", {}).get("Tmdb")
+                            mediaserver_item = schemas.MediaServerItem(
+                                server="emby",
+                                library=res_item.get("ParentId"),
+                                item_id=res_item.get("Id"),
+                                item_type=res_item.get("Type"),
+                                title=res_item.get("Name"),
+                                original_title=res_item.get("OriginalTitle"),
+                                year=res_item.get("ProductionYear"),
+                                tmdbid=int(item_tmdbid) if item_tmdbid else None,
+                                imdbid=res_item.get("ProviderIds", {}).get("Imdb"),
+                                tvdbid=res_item.get("ProviderIds", {}).get("Tvdb"),
+                                path=res_item.get("Path")
+                            )
+                            if tmdb_id and item_tmdbid:
+                                if str(item_tmdbid) != str(tmdb_id):
+                                    continue
+                                else:
+                                    ret_movies.append(mediaserver_item)
+                                    continue
+                            if (mediaserver_item.title == title
+                                    and (not year or str(mediaserver_item.year) == str(year))):
                                 ret_movies.append(mediaserver_item)
-                                continue
-                        if (mediaserver_item.title == title
-                                and (not year or str(mediaserver_item.year) == str(year))):
-                            ret_movies.append(mediaserver_item)
-                    return ret_movies
+                        return ret_movies
         except Exception as e:
             logger.error(f"连接Items出错：" + str(e))
             return None
@@ -401,25 +401,25 @@ class Emby:
         try:
             req_url = "%semby/Shows/%s/Episodes?Season=%s&IsMissing=false&api_key=%s" % (
                 self._host, item_id, season, self._apikey)
-            res_json = RequestUtils().get_res(req_url)
-            if res_json:
-                tv_item = res_json.json()
-                res_items = tv_item.get("Items")
-                season_episodes = {}
-                for res_item in res_items:
-                    season_index = res_item.get("ParentIndexNumber")
-                    if not season_index:
-                        continue
-                    if season and season != season_index:
-                        continue
-                    episode_index = res_item.get("IndexNumber")
-                    if not episode_index:
-                        continue
-                    if season_index not in season_episodes:
-                        season_episodes[season_index] = []
-                    season_episodes[season_index].append(episode_index)
-                # 返回
-                return item_id, season_episodes
+            with RequestUtils().get_res(req_url) as res_json:
+                if res_json:
+                    tv_item = res_json.json()
+                    res_items = tv_item.get("Items")
+                    season_episodes = {}
+                    for res_item in res_items:
+                        season_index = res_item.get("ParentIndexNumber")
+                        if not season_index:
+                            continue
+                        if season and season != season_index:
+                            continue
+                        episode_index = res_item.get("IndexNumber")
+                        if not episode_index:
+                            continue
+                        if season_index not in season_episodes:
+                            season_episodes[season_index] = []
+                        season_episodes[season_index].append(episode_index)
+                    # 返回
+                    return item_id, season_episodes
         except Exception as e:
             logger.error(f"连接Shows/Id/Episodes出错：" + str(e))
             return None, None
@@ -441,7 +441,6 @@ class Emby:
                 images = res.json().get("Images")
                 if images:
                     for image in images:
-                        logger.info(image)
                         if image.get("ProviderName") == "TheMovieDb" and image.get("Type") == image_type:
                             return image.get("Url")
             # 数据为空
@@ -464,13 +463,13 @@ class Emby:
 
         req_url = "%sItems/%s/Images/%s" % (self._playhost, item_id, image_type)
         try:
-            res = RequestUtils().get_res(req_url)
-            if res and res.status_code != 404:
-                logger.info("影片图片链接:{}".format(res.url))
-                return res.url
-            else:
-                logger.error("Items/Id/Images 未获取到返回数据或无该影片{}图片".format(image_type))
-                return None
+            with RequestUtils().get_res(req_url) as res:
+                if res and res.status_code != 404:
+                    logger.info(f"影片图片链接:{res.url}")
+                    return res.url
+                else:
+                    logger.error("Items/Id/Images 未获取到返回数据或无该影片{}图片".format(image_type))
+                    return None
         except Exception as e:
             logger.error(f"连接Items/Id/Images出错：" + str(e))
             return None
@@ -483,11 +482,11 @@ class Emby:
             return False
         req_url = "%semby/Items/%s/Refresh?Recursive=true&api_key=%s" % (self._host, item_id, self._apikey)
         try:
-            res = RequestUtils().post_res(req_url)
-            if res:
-                return True
-            else:
-                logger.info(f"刷新媒体库对象 {item_id} 失败，无法连接Emby！")
+            with RequestUtils().post_res(req_url) as res:
+                if res:
+                    return True
+                else:
+                    logger.info(f"刷新媒体库对象 {item_id} 失败，无法连接Emby！")
         except Exception as e:
             logger.error(f"连接Items/Id/Refresh出错：" + str(e))
             return False
@@ -501,11 +500,11 @@ class Emby:
             return False
         req_url = "%semby/Library/Refresh?api_key=%s" % (self._host, self._apikey)
         try:
-            res = RequestUtils().post_res(req_url)
-            if res:
-                return True
-            else:
-                logger.info(f"刷新媒体库失败，无法连接Emby！")
+            with RequestUtils().post_res(req_url) as res:
+                if res:
+                    return True
+                else:
+                    logger.info(f"刷新媒体库失败，无法连接Emby！")
         except Exception as e:
             logger.error(f"连接Library/Refresh出错：" + str(e))
             return False
@@ -580,23 +579,23 @@ class Emby:
             return None
         req_url = "%semby/Users/%s/Items/%s?api_key=%s" % (self._host, self.user, itemid, self._apikey)
         try:
-            res = RequestUtils().get_res(req_url)
-            if res and res.status_code == 200:
-                item = res.json()
-                tmdbid = item.get("ProviderIds", {}).get("Tmdb")
-                return schemas.MediaServerItem(
-                    server="emby",
-                    library=item.get("ParentId"),
-                    item_id=item.get("Id"),
-                    item_type=item.get("Type"),
-                    title=item.get("Name"),
-                    original_title=item.get("OriginalTitle"),
-                    year=item.get("ProductionYear"),
-                    tmdbid=int(tmdbid) if tmdbid else None,
-                    imdbid=item.get("ProviderIds", {}).get("Imdb"),
-                    tvdbid=item.get("ProviderIds", {}).get("Tvdb"),
-                    path=item.get("Path")
-                )
+            with RequestUtils().get_res(req_url) as res:
+                if res and res.status_code == 200:
+                    item = res.json()
+                    tmdbid = item.get("ProviderIds", {}).get("Tmdb")
+                    return schemas.MediaServerItem(
+                        server="emby",
+                        library=item.get("ParentId"),
+                        item_id=item.get("Id"),
+                        item_type=item.get("Type"),
+                        title=item.get("Name"),
+                        original_title=item.get("OriginalTitle"),
+                        year=item.get("ProductionYear"),
+                        tmdbid=int(tmdbid) if tmdbid else None,
+                        imdbid=item.get("ProviderIds", {}).get("Imdb"),
+                        tvdbid=item.get("ProviderIds", {}).get("Tvdb"),
+                        path=item.get("Path")
+                    )
         except Exception as e:
             logger.error(f"连接Items/Id出错：" + str(e))
         return None
@@ -611,17 +610,17 @@ class Emby:
             yield None
         req_url = "%semby/Users/%s/Items?ParentId=%s&api_key=%s" % (self._host, self.user, parent, self._apikey)
         try:
-            res = RequestUtils().get_res(req_url)
-            if res and res.status_code == 200:
-                results = res.json().get("Items") or []
-                for result in results:
-                    if not result:
-                        continue
-                    if result.get("Type") in ["Movie", "Series"]:
-                        yield self.get_iteminfo(result.get("Id"))
-                    elif "Folder" in result.get("Type"):
-                        for item in self.get_items(parent=result.get('Id')):
-                            yield item
+            with RequestUtils().get_res(req_url) as res:
+                if res and res.status_code == 200:
+                    results = res.json().get("Items") or []
+                    for result in results:
+                        if not result:
+                            continue
+                        if result.get("Type") in ["Movie", "Series"]:
+                            yield self.get_iteminfo(result.get("Id"))
+                        elif "Folder" in result.get("Type"):
+                            for item in self.get_items(parent=result.get('Id')):
+                                yield item
         except Exception as e:
             logger.error(f"连接Users/Items出错：" + str(e))
         yield None
@@ -1033,52 +1032,52 @@ class Emby:
         req_url = (f"{self._host}Users/{user}/Items/Resume?"
                    f"Limit=100&MediaTypes=Video&api_key={self._apikey}&Fields=ProductionYear,Path")
         try:
-            res = RequestUtils().get_res(req_url)
-            if res:
-                result = res.json().get("Items") or []
-                ret_resume = []
-                # 用户媒体库文件夹列表（排除黑名单）
-                library_folders = self.get_user_library_folders()
-                for item in result:
-                    if len(ret_resume) == num:
-                        break
-                    if item.get("Type") not in ["Movie", "Episode"]:
-                        continue
-                    item_path = item.get("Path")
-                    if item_path and library_folders and not any(
-                            str(item_path).startswith(folder) for folder in library_folders):
-                        continue
-                    item_type = MediaType.MOVIE.value if item.get("Type") == "Movie" else MediaType.TV.value
-                    link = self.get_play_url(item.get("Id"))
-                    if item_type == MediaType.MOVIE.value:
-                        title = item.get("Name")
-                        subtitle = item.get("ProductionYear")
-                    else:
-                        title = f'{item.get("SeriesName")}'
-                        subtitle = f'S{item.get("ParentIndexNumber")}:{item.get("IndexNumber")} - {item.get("Name")}'
-                    if item_type == MediaType.MOVIE.value:
-                        if item.get("BackdropImageTags"):
-                            image = self.__get_backdrop_url(item_id=item.get("Id"),
-                                                            image_tag=item.get("BackdropImageTags")[0])
+            with RequestUtils().get_res(req_url) as res:
+                if res:
+                    result = res.json().get("Items") or []
+                    ret_resume = []
+                    # 用户媒体库文件夹列表（排除黑名单）
+                    library_folders = self.get_user_library_folders()
+                    for item in result:
+                        if len(ret_resume) == num:
+                            break
+                        if item.get("Type") not in ["Movie", "Episode"]:
+                            continue
+                        item_path = item.get("Path")
+                        if item_path and library_folders and not any(
+                                str(item_path).startswith(folder) for folder in library_folders):
+                            continue
+                        item_type = MediaType.MOVIE.value if item.get("Type") == "Movie" else MediaType.TV.value
+                        link = self.get_play_url(item.get("Id"))
+                        if item_type == MediaType.MOVIE.value:
+                            title = item.get("Name")
+                            subtitle = item.get("ProductionYear")
                         else:
-                            image = self.__get_local_image_by_id(item.get("Id"))
-                    else:
-                        image = self.__get_backdrop_url(item_id=item.get("SeriesId"),
-                                                        image_tag=item.get("SeriesPrimaryImageTag"))
-                        if not image:
-                            image = self.__get_local_image_by_id(item.get("SeriesId"))
-                    ret_resume.append(schemas.MediaServerPlayItem(
-                        id=item.get("Id"),
-                        title=title,
-                        subtitle=subtitle,
-                        type=item_type,
-                        image=image,
-                        link=link,
-                        percent=item.get("UserData", {}).get("PlayedPercentage")
-                    ))
-                return ret_resume
-            else:
-                logger.error(f"Users/Items/Resume 未获取到返回数据")
+                            title = f'{item.get("SeriesName")}'
+                            subtitle = f'S{item.get("ParentIndexNumber")}:{item.get("IndexNumber")} - {item.get("Name")}'
+                        if item_type == MediaType.MOVIE.value:
+                            if item.get("BackdropImageTags"):
+                                image = self.__get_backdrop_url(item_id=item.get("Id"),
+                                                                image_tag=item.get("BackdropImageTags")[0])
+                            else:
+                                image = self.__get_local_image_by_id(item.get("Id"))
+                        else:
+                            image = self.__get_backdrop_url(item_id=item.get("SeriesId"),
+                                                            image_tag=item.get("SeriesPrimaryImageTag"))
+                            if not image:
+                                image = self.__get_local_image_by_id(item.get("SeriesId"))
+                        ret_resume.append(schemas.MediaServerPlayItem(
+                            id=item.get("Id"),
+                            title=title,
+                            subtitle=subtitle,
+                            type=item_type,
+                            image=image,
+                            link=link,
+                            percent=item.get("UserData", {}).get("PlayedPercentage")
+                        ))
+                    return ret_resume
+                else:
+                    logger.error(f"Users/Items/Resume 未获取到返回数据")
         except Exception as e:
             logger.error(f"连接Users/Items/Resume出错：" + str(e))
         return []
@@ -1096,35 +1095,35 @@ class Emby:
         req_url = (f"{self._host}Users/{user}/Items/Latest?"
                    f"Limit=100&MediaTypes=Video&api_key={self._apikey}&Fields=ProductionYear,Path")
         try:
-            res = RequestUtils().get_res(req_url)
-            if res:
-                result = res.json() or []
-                ret_latest = []
-                # 用户媒体库文件夹列表（排除黑名单）
-                library_folders = self.get_user_library_folders()
-                for item in result:
-                    if len(ret_latest) == num:
-                        break
-                    if item.get("Type") not in ["Movie", "Series"]:
-                        continue
-                    item_path = item.get("Path")
-                    if item_path and library_folders and not any(
-                            str(item_path).startswith(folder) for folder in library_folders):
-                        continue
-                    item_type = MediaType.MOVIE.value if item.get("Type") == "Movie" else MediaType.TV.value
-                    link = self.get_play_url(item.get("Id"))
-                    image = self.__get_local_image_by_id(item_id=item.get("Id"))
-                    ret_latest.append(schemas.MediaServerPlayItem(
-                        id=item.get("Id"),
-                        title=item.get("Name"),
-                        subtitle=item.get("ProductionYear"),
-                        type=item_type,
-                        image=image,
-                        link=link
-                    ))
-                return ret_latest
-            else:
-                logger.error(f"Users/Items/Latest 未获取到返回数据")
+            with RequestUtils().get_res(req_url) as res:
+                if res:
+                    result = res.json() or []
+                    ret_latest = []
+                    # 用户媒体库文件夹列表（排除黑名单）
+                    library_folders = self.get_user_library_folders()
+                    for item in result:
+                        if len(ret_latest) == num:
+                            break
+                        if item.get("Type") not in ["Movie", "Series"]:
+                            continue
+                        item_path = item.get("Path")
+                        if item_path and library_folders and not any(
+                                str(item_path).startswith(folder) for folder in library_folders):
+                            continue
+                        item_type = MediaType.MOVIE.value if item.get("Type") == "Movie" else MediaType.TV.value
+                        link = self.get_play_url(item.get("Id"))
+                        image = self.__get_local_image_by_id(item_id=item.get("Id"))
+                        ret_latest.append(schemas.MediaServerPlayItem(
+                            id=item.get("Id"),
+                            title=item.get("Name"),
+                            subtitle=item.get("ProductionYear"),
+                            type=item_type,
+                            image=image,
+                            link=link
+                        ))
+                    return ret_latest
+                else:
+                    logger.error(f"Users/Items/Latest 未获取到返回数据")
         except Exception as e:
             logger.error(f"连接Users/Items/Latest出错：" + str(e))
         return []

app/modules/fanart/__init__.py

@@ -321,11 +321,11 @@ class FanartModule(_ModuleBase):
         """
         测试模块连接性
         """
-        ret = RequestUtils().get_res("https://webservice.fanart.tv")
-        if ret and ret.status_code == 200:
-            return True, ""
-        elif ret:
-            return False, f"无法连接fanart，错误码：{ret.status_code}"
+        with RequestUtils().get_res("https://webservice.fanart.tv") as ret:
+            if ret and ret.status_code == 200:
+                return True, ""
+            elif ret:
+                return False, f"无法连接fanart，错误码：{ret.status_code}"
         return False, "fanart网络连接失败"
 
     def init_setting(self) -> Tuple[str, Union[str, bool]]:

app/modules/filetransfer/__init__.py

@@ -43,7 +43,7 @@ class FileTransferModule(_ModuleBase):
                 continue
             download_path = Path(path)
             if not download_path.exists():
-                return False, f"目录 {download_path} 不存在"
+                return False, f"下载目录 {download_path} 不存在"
             download_paths.append(path)
         # 下载目录的设备ID
         download_devids = [Path(path).stat().st_dev for path in download_paths]
@@ -54,7 +54,7 @@ class FileTransferModule(_ModuleBase):
         for path in settings.LIBRARY_PATHS:
             library_path = Path(path)
             if not library_path.exists():
-                return False, f"目录不存在：{library_path}"
+                return False, f"媒体库目录不存在：{library_path}"
             if settings.DOWNLOADER_MONITOR and settings.TRANSFER_TYPE == "link":
                 if library_path.stat().st_dev not in download_devids:
                     return False, f"媒体库目录 {library_path} " \
@@ -627,7 +627,7 @@ class FileTransferModule(_ModuleBase):
             # 原语种标题
             "original_title": __convert_invalid_characters(mediainfo.original_title),
             # 原文件名
-            "original_name": f"{meta.org_string}{file_ext}",
+            "original_name": meta.org_string,
             # 识别名称（优先使用中文）
             "name": meta.name,
             # 识别的英文名称（可能为空）
@@ -663,7 +663,7 @@ class FileTransferModule(_ModuleBase):
             # 段/节
             "part": meta.part,
             # 剧集标题
-            "episode_title": episode_title,
+            "episode_title": __convert_invalid_characters(episode_title),
             # 文件后缀
             "fileExt": file_ext,
             # 自定义占位符
@@ -726,7 +726,11 @@ class FileTransferModule(_ModuleBase):
                 try:
                     # 计算in_path和path的公共字符串长度
                     relative = StringUtils.find_common_prefix(str(in_path), str(path))
+                    if len(str(path)) == len(relative):
+                        # 目录完整匹配的，直接返回
+                        return path
                     if len(relative) > max_length:
+                        # 更新最大长度
                         max_length = len(relative)
                         target_path = path
                 except Exception as e:

app/modules/filter/__init__.py

@@ -163,13 +163,13 @@ class FilterModule(_ModuleBase):
         # 返回种子列表
         ret_torrents = []
         for torrent in torrent_list:
-            # 能命中优先级的才返回
-            if not self.__get_order(torrent, rule_string):
-                continue
             # 季集数过滤
             if season_episodes \
                     and not self.__match_season_episodes(torrent, season_episodes):
                 continue
+            # 能命中优先级的才返回
+            if not self.__get_order(torrent, rule_string):
+                continue
             ret_torrents.append(torrent)
 
         return ret_torrents
@@ -191,7 +191,7 @@ class FilterModule(_ModuleBase):
         torrent_episodes = meta.episode_list
         if not set(torrent_seasons).issubset(set(seasons)):
             # 种子季不在过滤季中
-            logger.info(f"种子 {torrent.site_name} - {torrent.title} 不是需要的季")
+            logger.info(f"种子 {torrent.site_name} - {torrent.title} 包含季 {torrent_seasons} 不是需要的季 {seasons}")
             return False
         if not torrent_episodes:
             # 整季按匹配处理

app/modules/indexer/__init__.py

@@ -3,7 +3,9 @@ from typing import List, Optional, Tuple, Union
 
 from ruamel.yaml import CommentedMap
 
+from app.core.config import settings
 from app.core.context import TorrentInfo
+from app.db.sytestatistic_oper import SiteStatisticOper
 from app.helper.sites import SitesHelper
 from app.log import logger
 from app.modules import _ModuleBase
@@ -50,6 +52,18 @@ class IndexerModule(_ModuleBase):
         :param page:  页码
         :return: 资源列表
         """
+
+        def __remove_duplicate(_torrents: List[TorrentInfo]) -> List[TorrentInfo]:
+            """
+            去除重复的种子
+            :param _torrents: 种子列表
+            :return: 去重后的种子列表
+            """
+            if not settings.SEARCH_MULTIPLE_NAME:
+                return _torrents
+            # 通过encosure去重
+            return list({f"{t.title}_{t.description}": t for t in _torrents}.values())
+
         # 确认搜索的名字
         if not keywords:
             # 浏览种子页
@@ -57,10 +71,12 @@ class IndexerModule(_ModuleBase):
 
         # 开始索引
         result_array = []
+
         # 开始计时
         start_time = datetime.now()
 
         # 搜索多个关键字
+        error_flag = False
         for search_word in keywords:
             # 可能为关键字或ttxxxx
             if search_word \
@@ -76,36 +92,51 @@ class IndexerModule(_ModuleBase):
 
             try:
                 if site.get('parser') == "TNodeSpider":
-                    error_flag, result_array = TNodeSpider(site).search(
+                    error_flag, result = TNodeSpider(site).search(
                         keyword=search_word,
                         page=page
                     )
                 elif site.get('parser') == "TorrentLeech":
-                    error_flag, result_array = TorrentLeech(site).search(
+                    error_flag, result = TorrentLeech(site).search(
                         keyword=search_word,
                         page=page
                     )
                 elif site.get('parser') == "mTorrent":
-                    error_flag, result_array = MTorrentSpider(site).search(
+                    error_flag, result = MTorrentSpider(site).search(
                         keyword=search_word,
                         mtype=mtype,
                         page=page
                     )
                 else:
-                    error_flag, result_array = self.__spider_search(
+                    error_flag, result = self.__spider_search(
                         search_word=search_word,
                         indexer=site,
                         mtype=mtype,
                         page=page
                     )
-                # 有结果后停止
-                if result_array:
+                if error_flag:
+                    break
+                if not result:
+                    continue
+                if settings.SEARCH_MULTIPLE_NAME:
+                    # 合并多个结果
+                    result_array.extend(result)
+                else:
+                    # 有结果就停止
+                    result_array = result
                     break
             except Exception as err:
                 logger.error(f"{site.get('name')} 搜索出错：{str(err)}")
 
         # 索引花费的时间
-        seconds = round((datetime.now() - start_time).seconds, 1)
+        seconds = (datetime.now() - start_time).seconds
+
+        # 统计索引情况
+        domain = StringUtils.get_url_domain(site.get("domain"))
+        if error_flag:
+            SiteStatisticOper().fail(domain)
+        else:
+            SiteStatisticOper().success(domain=domain, seconds=seconds)
 
         # 返回结果
         if not result_array or len(result_array) == 0:
@@ -113,14 +144,16 @@ class IndexerModule(_ModuleBase):
             return []
         else:
             logger.info(f"{site.get('name')} 搜索完成，耗时 {seconds} 秒，返回数据：{len(result_array)}")
-            # 合并站点信息，以TorrentInfo返回
-            return [TorrentInfo(site=site.get("id"),
-                                site_name=site.get("name"),
-                                site_cookie=site.get("cookie"),
-                                site_ua=site.get("ua"),
-                                site_proxy=site.get("proxy"),
-                                site_order=site.get("pri"),
-                                **result) for result in result_array]
+            # TorrentInfo
+            torrents = [TorrentInfo(site=site.get("id"),
+                                    site_name=site.get("name"),
+                                    site_cookie=site.get("cookie"),
+                                    site_ua=site.get("ua"),
+                                    site_proxy=site.get("proxy"),
+                                    site_order=site.get("pri"),
+                                    **result) for result in result_array]
+            # 去重
+            return __remove_duplicate(torrents)
 
     @staticmethod
     def __spider_search(indexer: CommentedMap,

app/modules/indexer/mtorrent.py

@@ -6,6 +6,7 @@ from typing import Tuple, List
 from ruamel.yaml import CommentedMap
 
 from app.core.config import settings
+from app.db.systemconfig_oper import SystemConfigOper
 from app.log import logger
 from app.schemas import MediaType
 from app.utils.http import RequestUtils
@@ -13,6 +14,9 @@ from app.utils.string import StringUtils
 
 
 class MTorrentSpider:
+    """
+    mTorrent API，需要缓存ApiKey
+    """
     _indexerid = None
     _domain = None
     _name = ""
@@ -28,14 +32,23 @@ class MTorrentSpider:
     _movie_category = ['401', '419', '420', '421', '439', '405', '404']
     _tv_category = ['403', '402', '435', '438', '404', '405']
 
+    # API KEY
+    _apikey = None
+
     # 标签
     _labels = {
-        0: "",
-        4: "中字",
-        6: "国配",
+        "0": "",
+        "1": "DIY",
+        "2": "国配",
+        "3": "DIY 国配",
+        "4": "中字",
+        "5": "DIY 中字",
+        "6": "国配 中字",
+        "7": "DIY 国配 中字"
     }
 
     def __init__(self, indexer: CommentedMap):
+        self.systemconfig = SystemConfigOper()
         if indexer:
             self._indexerid = indexer.get('id')
             self._domain = indexer.get('domain')
@@ -46,7 +59,51 @@ class MTorrentSpider:
             self._cookie = indexer.get('cookie')
             self._ua = indexer.get('ua')
 
+    def __get_apikey(self) -> str:
+        """
+        获取ApiKey
+        """
+        domain_host = StringUtils.get_url_host(self._domain)
+        self._apikey = self.systemconfig.get(f"site.{domain_host}.apikey")
+        if not self._apikey:
+            try:
+                res = RequestUtils(
+                    headers={
+                        "Content-Type": "application/json",
+                        "User-Agent": f"{self._ua}"
+                    },
+                    cookies=self._cookie,
+                    ua=self._ua,
+                    proxies=self._proxy,
+                    referer=f"{self._domain}usercp?tab=laboratory",
+                    timeout=15
+                ).post_res(url=f"{self._domain}api/apikey/getKeyList")
+                if res and res.status_code == 200:
+                    api_keys = res.json().get('data')
+                    if api_keys:
+                        logger.info(f"{self._name} 获取ApiKey成功")
+                        # 按lastModifiedDate倒序排序
+                        api_keys.sort(key=lambda x: x.get('lastModifiedDate'), reverse=True)
+                        self._apikey = api_keys[0].get('apiKey')
+                        self.systemconfig.set(f"site.{domain_host}.apikey", self._apikey)
+                    else:
+                        logger.warn(f"{self._name} 获取ApiKey失败，请先在`控制台`->`实验室`建立存取令牌")
+                else:
+                    logger.warn(f"{self._name} 获取ApiKey失败，请检查Cookie是否有效")
+            except Exception as e:
+                logger.error(f"{self._name} 获取ApiKey出错：{e}")
+        return self._apikey
+
     def search(self, keyword: str, mtype: MediaType = None, page: int = 0) -> Tuple[bool, List[dict]]:
+        """
+        搜索
+        """
+        # 检查ApiKey
+        self.__get_apikey()
+
+        if not self._apikey:
+            return True, []
+
         if not mtype:
             categories = []
         elif mtype == MediaType.TV:
@@ -63,31 +120,45 @@ class MTorrentSpider:
         res = RequestUtils(
             headers={
                 "Content-Type": "application/json",
-                "User-Agent": f"{self._ua}"
+                "User-Agent": f"{self._ua}",
+                "x-api-key": self._apikey
             },
-            cookies=self._cookie,
             proxies=self._proxy,
             referer=f"{self._domain}browse",
-            timeout=30
+            timeout=15
         ).post_res(url=self._searchurl, json=params)
         torrents = []
         if res and res.status_code == 200:
             results = res.json().get('data', {}).get("data") or []
             for result in results:
+                category_value = result.get('category')
+                if category_value in self._tv_category \
+                        and category_value not in self._movie_category:
+                    category = MediaType.TV.value
+                elif category_value in self._movie_category:
+                    category = MediaType.MOVIE.value
+                else:
+                    category = MediaType.UNKNOWN.value
+                labels_value = self._labels.get(result.get('labels') or "0") or ""
+                if labels_value:
+                    labels = labels_value.split()
+                else:
+                    labels = []
                 torrent = {
                     'title': result.get('name'),
                     'description': result.get('smallDescr'),
                     'enclosure': self.__get_download_url(result.get('id')),
                     'pubdate': StringUtils.format_timestamp(result.get('createdDate')),
-                    'size': result.get('size'),
-                    'seeders': result.get('status', {}).get("seeders"),
-                    'peers': result.get('status', {}).get("leechers"),
-                    'grabs': result.get('status', {}).get("timesCompleted"),
+                    'size': int(result.get('size') or '0'),
+                    'seeders': int(result.get('status', {}).get("seeders") or '0'),
+                    'peers': int(result.get('status', {}).get("leechers") or '0'),
+                    'grabs': int(result.get('status', {}).get("timesCompleted") or '0'),
                     'downloadvolumefactor': self.__get_downloadvolumefactor(result.get('status', {}).get("discount")),
                     'uploadvolumefactor': self.__get_uploadvolumefactor(result.get('status', {}).get("discount")),
                     'page_url': self._pageurl % (self._domain, result.get('id')),
                     'imdbid': self.__find_imdbid(result.get('imdb')),
-                    'labels': [self._labels.get(result.get('labels') or 0)] if result.get('labels') else []
+                    'labels': labels,
+                    'category': category
                 }
                 torrents.append(torrent)
         elif res is not None:
@@ -100,6 +171,9 @@ class MTorrentSpider:
 
     @staticmethod
     def __find_imdbid(imdb: str) -> str:
+        """
+        从imdb链接中提取imdbid
+        """
         if imdb:
             m = re.search(r"tt\d+", imdb)
             if m:
@@ -108,6 +182,9 @@ class MTorrentSpider:
 
     @staticmethod
     def __get_downloadvolumefactor(discount: str) -> float:
+        """
+        获取下载系数
+        """
         discount_dict = {
             "FREE": 0,
             "PERCENT_50": 0.5,
@@ -121,6 +198,9 @@ class MTorrentSpider:
 
     @staticmethod
     def __get_uploadvolumefactor(discount: str) -> float:
+        """
+        获取上传系数
+        """
         uploadvolumefactor_dict = {
             "_2X": 2.0,
             "_2X_FREE": 2.0,
@@ -131,12 +211,22 @@ class MTorrentSpider:
         return 1
 
     def __get_download_url(self, torrent_id: str) -> str:
+        """
+        获取下载链接，返回base64编码的json字符串及URL
+        """
         url = self._downloadurl % self._domain
         params = {
             'method': 'post',
+            'cookie': False,
             'params': {
                 'id': torrent_id
             },
+            'header': {
+                'Content-Type': 'application/json',
+                'User-Agent': f'{self._ua}',
+                'Accept': 'application/json, text/plain, */*',
+                'x-api-key': self._apikey
+            },
             'result': 'data'
         }
         # base64编码

app/modules/indexer/spider.py

@@ -95,7 +95,7 @@ class TorrentSpider:
         self.render = indexer.get('render')
         self.domain = indexer.get('domain')
         self.result_num = int(indexer.get('result_num') or 100)
-        self._timeout = int(indexer.get('timeout') or 30)
+        self._timeout = int(indexer.get('timeout') or 15)
         self.page = page
         if self.domain and not str(self.domain).endswith("/"):
             self.domain = self.domain + "/"

app/modules/indexer/tnode.py

@@ -77,7 +77,7 @@ class TNodeSpider:
             },
             cookies=self._cookie,
             proxies=self._proxy,
-            timeout=30
+            timeout=15
         ).post_res(url=self._searchurl, json=params)
         torrents = []
         if res and res.status_code == 200:

app/modules/indexer/torrentleech.py

@@ -40,7 +40,7 @@ class TorrentLeech:
             },
             cookies=self._indexer.get('cookie'),
             proxies=self._proxy,
-            timeout=30
+            timeout=15
         ).get_res(url)
         torrents = []
         if res and res.status_code == 200:

app/modules/jellyfin/jellyfin.py

@@ -52,12 +52,12 @@ class Jellyfin:
             return []
         req_url = "%sLibrary/SelectableMediaFolders?api_key=%s" % (self._host, self._apikey)
         try:
-            res = RequestUtils().get_res(req_url)
-            if res:
-                return res.json()
-            else:
-                logger.error(f"Library/SelectableMediaFolders 未获取到返回数据")
-                return []
+            with RequestUtils().get_res(req_url) as res:
+                if res:
+                    return res.json()
+                else:
+                    logger.error(f"Library/SelectableMediaFolders 未获取到返回数据")
+                    return []
         except Exception as e:
             logger.error(f"连接Library/SelectableMediaFolders 出错：" + str(e))
             return []
@@ -70,29 +70,29 @@ class Jellyfin:
             return []
         req_url = "%sLibrary/VirtualFolders?api_key=%s" % (self._host, self._apikey)
         try:
-            res = RequestUtils().get_res(req_url)
-            if res:
-                library_items = res.json()
-                librarys = []
-                for library_item in library_items:
-                    library_name = library_item.get('Name')
-                    pathInfos = library_item.get('LibraryOptions', {}).get('PathInfos')
-                    library_paths = []
-                    for path in pathInfos:
-                        if path.get('NetworkPath'):
-                            library_paths.append(path.get('NetworkPath'))
-                        else:
-                            library_paths.append(path.get('Path'))
+            with RequestUtils().get_res(req_url) as res:
+                if res:
+                    library_items = res.json()
+                    librarys = []
+                    for library_item in library_items:
+                        library_name = library_item.get('Name')
+                        pathInfos = library_item.get('LibraryOptions', {}).get('PathInfos')
+                        library_paths = []
+                        for path in pathInfos:
+                            if path.get('NetworkPath'):
+                                library_paths.append(path.get('NetworkPath'))
+                            else:
+                                library_paths.append(path.get('Path'))
 
-                    if library_name and library_paths:
-                        librarys.append({
-                            'Name': library_name,
-                            'Path': library_paths
-                        })
-                return librarys
-            else:
-                logger.error(f"Library/VirtualFolders 未获取到返回数据")
-                return []
+                        if library_name and library_paths:
+                            librarys.append({
+                                'Name': library_name,
+                                'Path': library_paths
+                            })
+                    return librarys
+                else:
+                    logger.error(f"Library/VirtualFolders 未获取到返回数据")
+                    return []
         except Exception as e:
             logger.error(f"连接Library/VirtualFolders 出错：" + str(e))
             return []
@@ -109,12 +109,12 @@ class Jellyfin:
             user = self.user
         req_url = f"{self._host}Users/{user}/Views?api_key={self._apikey}"
         try:
-            res = RequestUtils().get_res(req_url)
-            if res:
-                return res.json().get("Items")
-            else:
-                logger.error(f"Users/Views 未获取到返回数据")
-                return []
+            with RequestUtils().get_res(req_url) as res:
+                if res:
+                    return res.json().get("Items")
+                else:
+                    logger.error(f"Users/Views 未获取到返回数据")
+                    return []
         except Exception as e:
             logger.error(f"连接Users/Views 出错：" + str(e))
             return []
@@ -138,10 +138,10 @@ class Jellyfin:
                 case _:
                     continue
             image = self.__get_local_image_by_id(library.get("Id"))
-            link = f"{self._playhost or self._host}web/index.html#!" \
+            link = f"{self._playhost or self._host}web/index.html#" \
                    f"/movies.html?topParentId={library.get('Id')}" \
                 if library_type == MediaType.MOVIE.value \
-                else f"{self._playhost or self._host}web/index.html#!" \
+                else f"{self._playhost or self._host}web/index.html#" \
                      f"/tv.html?topParentId={library.get('Id')}"
             libraries.append(
                 schemas.MediaServerLibrary(
@@ -163,12 +163,12 @@ class Jellyfin:
             return 0
         req_url = "%sUsers?api_key=%s" % (self._host, self._apikey)
         try:
-            res = RequestUtils().get_res(req_url)
-            if res:
-                return len(res.json())
-            else:
-                logger.error(f"Users 未获取到返回数据")
-                return 0
+            with RequestUtils().get_res(req_url) as res:
+                if res:
+                    return len(res.json())
+                else:
+                    logger.error(f"Users 未获取到返回数据")
+                    return 0
         except Exception as e:
             logger.error(f"连接Users出错：" + str(e))
             return 0
@@ -181,20 +181,20 @@ class Jellyfin:
             return None
         req_url = "%sUsers?api_key=%s" % (self._host, self._apikey)
         try:
-            res = RequestUtils().get_res(req_url)
-            if res:
-                users = res.json()
-                # 先查询是否有与当前用户名称匹配的
-                if user_name:
+            with RequestUtils().get_res(req_url) as res:
+                if res:
+                    users = res.json()
+                    # 先查询是否有与当前用户名称匹配的
+                    if user_name:
+                        for user in users:
+                            if user.get("Name") == user_name:
+                                return user.get("Id")
+                    # 查询管理员
                     for user in users:
-                        if user.get("Name") == user_name:
+                        if user.get("Policy", {}).get("IsAdministrator"):
                             return user.get("Id")
-                # 查询管理员
-                for user in users:
-                    if user.get("Policy", {}).get("IsAdministrator"):
-                        return user.get("Id")
-            else:
-                logger.error(f"Users 未获取到返回数据")
+                else:
+                    logger.error(f"Users 未获取到返回数据")
         except Exception as e:
             logger.error(f"连接Users出错：" + str(e))
         return None
@@ -244,11 +244,11 @@ class Jellyfin:
             return None
         req_url = "%sSystem/Info?api_key=%s" % (self._host, self._apikey)
         try:
-            res = RequestUtils().get_res(req_url)
-            if res:
-                return res.json().get("Id")
-            else:
-                logger.error(f"System/Info 未获取到返回数据")
+            with RequestUtils().get_res(req_url) as res:
+                if res:
+                    return res.json().get("Id")
+                else:
+                    logger.error(f"System/Info 未获取到返回数据")
         except Exception as e:
             logger.error(f"连接System/Info出错：" + str(e))
         return None
@@ -262,17 +262,17 @@ class Jellyfin:
             return schemas.Statistic()
         req_url = "%sItems/Counts?api_key=%s" % (self._host, self._apikey)
         try:
-            res = RequestUtils().get_res(req_url)
-            if res:
-                result = res.json()
-                return schemas.Statistic(
-                    movie_count=result.get("MovieCount") or 0,
-                    tv_count=result.get("SeriesCount") or 0,
-                    episode_count=result.get("EpisodeCount") or 0
-                )
-            else:
-                logger.error(f"Items/Counts 未获取到返回数据")
-                return schemas.Statistic()
+            with RequestUtils().get_res(req_url) as res:
+                if res:
+                    result = res.json()
+                    return schemas.Statistic(
+                        movie_count=result.get("MovieCount") or 0,
+                        tv_count=result.get("SeriesCount") or 0,
+                        episode_count=result.get("EpisodeCount") or 0
+                    )
+                else:
+                    logger.error(f"Items/Counts 未获取到返回数据")
+                    return schemas.Statistic()
         except Exception as e:
             logger.error(f"连接Items/Counts出错：" + str(e))
         return schemas.Statistic()
@@ -287,14 +287,14 @@ class Jellyfin:
                    "api_key=%s&searchTerm=%s&IncludeItemTypes=Series&Limit=10&Recursive=true") % (
                       self._host, self.user, self._apikey, name)
         try:
-            res = RequestUtils().get_res(req_url)
-            if res:
-                res_items = res.json().get("Items")
-                if res_items:
-                    for res_item in res_items:
-                        if res_item.get('Name') == name and (
-                                not year or str(res_item.get('ProductionYear')) == str(year)):
-                            return res_item.get('Id')
+            with RequestUtils().get_res(req_url) as res:
+                if res:
+                    res_items = res.json().get("Items")
+                    if res_items:
+                        for res_item in res_items:
+                            if res_item.get('Name') == name and (
+                                    not year or str(res_item.get('ProductionYear')) == str(year)):
+                                return res_item.get('Id')
         except Exception as e:
             logger.error(f"连接Items出错：" + str(e))
             return None
@@ -317,36 +317,36 @@ class Jellyfin:
                    "api_key=%s&searchTerm=%s&IncludeItemTypes=Movie&Limit=10&Recursive=true") % (
                       self._host, self.user, self._apikey, title)
         try:
-            res = RequestUtils().get_res(req_url)
-            if res:
-                res_items = res.json().get("Items")
-                if res_items:
-                    ret_movies = []
-                    for item in res_items:
-                        item_tmdbid = item.get("ProviderIds", {}).get("Tmdb")
-                        mediaserver_item = schemas.MediaServerItem(
-                            server="jellyfin",
-                            library=item.get("ParentId"),
-                            item_id=item.get("Id"),
-                            item_type=item.get("Type"),
-                            title=item.get("Name"),
-                            original_title=item.get("OriginalTitle"),
-                            year=item.get("ProductionYear"),
-                            tmdbid=int(item_tmdbid) if item_tmdbid else None,
-                            imdbid=item.get("ProviderIds", {}).get("Imdb"),
-                            tvdbid=item.get("ProviderIds", {}).get("Tvdb"),
-                            path=item.get("Path")
-                        )
-                        if tmdb_id and item_tmdbid:
-                            if str(item_tmdbid) != str(tmdb_id):
-                                continue
-                            else:
+            with RequestUtils().get_res(req_url) as res:
+                if res:
+                    res_items = res.json().get("Items")
+                    if res_items:
+                        ret_movies = []
+                        for item in res_items:
+                            item_tmdbid = item.get("ProviderIds", {}).get("Tmdb")
+                            mediaserver_item = schemas.MediaServerItem(
+                                server="jellyfin",
+                                library=item.get("ParentId"),
+                                item_id=item.get("Id"),
+                                item_type=item.get("Type"),
+                                title=item.get("Name"),
+                                original_title=item.get("OriginalTitle"),
+                                year=item.get("ProductionYear"),
+                                tmdbid=int(item_tmdbid) if item_tmdbid else None,
+                                imdbid=item.get("ProviderIds", {}).get("Imdb"),
+                                tvdbid=item.get("ProviderIds", {}).get("Tvdb"),
+                                path=item.get("Path")
+                            )
+                            if tmdb_id and item_tmdbid:
+                                if str(item_tmdbid) != str(tmdb_id):
+                                    continue
+                                else:
+                                    ret_movies.append(mediaserver_item)
+                                    continue
+                            if mediaserver_item.title == title and (
+                                    not year or str(mediaserver_item.year) == str(year)):
                                 ret_movies.append(mediaserver_item)
-                                continue
-                        if mediaserver_item.title == title and (
-                                not year or str(mediaserver_item.year) == str(year)):
-                            ret_movies.append(mediaserver_item)
-                    return ret_movies
+                        return ret_movies
         except Exception as e:
             logger.error(f"连接Items出错：" + str(e))
             return None
@@ -387,25 +387,25 @@ class Jellyfin:
         try:
             req_url = "%sShows/%s/Episodes?season=%s&&userId=%s&isMissing=false&api_key=%s" % (
                 self._host, item_id, season, self.user, self._apikey)
-            res_json = RequestUtils().get_res(req_url)
-            if res_json:
-                tv_info = res_json.json()
-                res_items = tv_info.get("Items")
-                # 返回的季集信息
-                season_episodes = {}
-                for res_item in res_items:
-                    season_index = res_item.get("ParentIndexNumber")
-                    if not season_index:
-                        continue
-                    if season and season != season_index:
-                        continue
-                    episode_index = res_item.get("IndexNumber")
-                    if not episode_index:
-                        continue
-                    if not season_episodes.get(season_index):
-                        season_episodes[season_index] = []
-                    season_episodes[season_index].append(episode_index)
-                return item_id, season_episodes
+            with RequestUtils().get_res(req_url) as res_json:
+                if res_json:
+                    tv_info = res_json.json()
+                    res_items = tv_info.get("Items")
+                    # 返回的季集信息
+                    season_episodes = {}
+                    for res_item in res_items:
+                        season_index = res_item.get("ParentIndexNumber")
+                        if not season_index:
+                            continue
+                        if season and season != season_index:
+                            continue
+                        episode_index = res_item.get("IndexNumber")
+                        if not episode_index:
+                            continue
+                        if not season_episodes.get(season_index):
+                            season_episodes[season_index] = []
+                        season_episodes[season_index].append(episode_index)
+                    return item_id, season_episodes
         except Exception as e:
             logger.error(f"连接Shows/Id/Episodes出错：" + str(e))
             return None, None
@@ -458,13 +458,13 @@ class Jellyfin:
             _host = self._playhost
         req_url = "%sItems/%s/Images/%s" % (_host, item_id, image_type)
         try:
-            res = RequestUtils().get_res(req_url)
-            if res and res.status_code != 404:
-                logger.info("影片图片链接:{}".format(res.url))
-                return res.url
-            else:
-                logger.error("Items/Id/Images 未获取到返回数据或无该影片{}图片".format(image_type))
-                return None
+            with RequestUtils().get_res(req_url) as res:
+                if res and res.status_code != 404:
+                    logger.info(f"影片图片链接:{res.url}")
+                    return res.url
+                else:
+                    logger.error("Items/Id/Images 未获取到返回数据或无该影片{}图片".format(image_type))
+                    return None
         except Exception as e:
             logger.error(f"连接Items/Id/Images出错：" + str(e))
             return None
@@ -479,12 +479,12 @@ class Jellyfin:
         """
         req_url = "%sItems/%s/Ancestors?api_key=%s" % (self._host, item_id, self._apikey)
         try:
-            res = RequestUtils().get_res(req_url)
-            if res:
-                return res.json()[index].get(key)
-            else:
-                logger.error(f"Items/Id/Ancestors 未获取到返回数据")
-                return None
+            with RequestUtils().get_res(req_url) as res:
+                if res:
+                    return res.json()[index].get(key)
+                else:
+                    logger.error(f"Items/Id/Ancestors 未获取到返回数据")
+                    return None
         except Exception as e:
             logger.error(f"连接Items/Id/Ancestors出错：" + str(e))
             return None
@@ -497,11 +497,11 @@ class Jellyfin:
             return False
         req_url = "%sLibrary/Refresh?api_key=%s" % (self._host, self._apikey)
         try:
-            res = RequestUtils().post_res(req_url)
-            if res:
-                return True
-            else:
-                logger.info(f"刷新媒体库失败，无法连接Jellyfin！")
+            with RequestUtils().post_res(req_url) as res:
+                if res:
+                    return True
+                else:
+                    logger.info(f"刷新媒体库失败，无法连接Jellyfin！")
         except Exception as e:
             logger.error(f"连接Library/Refresh出错：" + str(e))
             return False
@@ -632,23 +632,23 @@ class Jellyfin:
         req_url = "%sUsers/%s/Items/%s?api_key=%s" % (
             self._host, self.user, itemid, self._apikey)
         try:
-            res = RequestUtils().get_res(req_url)
-            if res and res.status_code == 200:
-                item = res.json()
-                tmdbid = item.get("ProviderIds", {}).get("Tmdb")
-                return schemas.MediaServerItem(
-                    server="jellyfin",
-                    library=item.get("ParentId"),
-                    item_id=item.get("Id"),
-                    item_type=item.get("Type"),
-                    title=item.get("Name"),
-                    original_title=item.get("OriginalTitle"),
-                    year=item.get("ProductionYear"),
-                    tmdbid=int(tmdbid) if tmdbid else None,
-                    imdbid=item.get("ProviderIds", {}).get("Imdb"),
-                    tvdbid=item.get("ProviderIds", {}).get("Tvdb"),
-                    path=item.get("Path")
-                )
+            with RequestUtils().get_res(req_url) as res:
+                if res and res.status_code == 200:
+                    item = res.json()
+                    tmdbid = item.get("ProviderIds", {}).get("Tmdb")
+                    return schemas.MediaServerItem(
+                        server="jellyfin",
+                        library=item.get("ParentId"),
+                        item_id=item.get("Id"),
+                        item_type=item.get("Type"),
+                        title=item.get("Name"),
+                        original_title=item.get("OriginalTitle"),
+                        year=item.get("ProductionYear"),
+                        tmdbid=int(tmdbid) if tmdbid else None,
+                        imdbid=item.get("ProviderIds", {}).get("Imdb"),
+                        tvdbid=item.get("ProviderIds", {}).get("Tvdb"),
+                        path=item.get("Path")
+                    )
         except Exception as e:
             logger.error(f"连接Users/Items出错：" + str(e))
         return None
@@ -663,17 +663,17 @@ class Jellyfin:
             yield None
         req_url = "%sUsers/%s/Items?parentId=%s&api_key=%s" % (self._host, self.user, parent, self._apikey)
         try:
-            res = RequestUtils().get_res(req_url)
-            if res and res.status_code == 200:
-                results = res.json().get("Items") or []
-                for result in results:
-                    if not result:
-                        continue
-                    if result.get("Type") in ["Movie", "Series"]:
-                        yield self.get_iteminfo(result.get("Id"))
-                    elif "Folder" in result.get("Type"):
-                        for item in self.get_items(result.get("Id")):
-                            yield item
+            with RequestUtils().get_res(req_url) as res:
+                if res and res.status_code == 200:
+                    results = res.json().get("Items") or []
+                    for result in results:
+                        if not result:
+                            continue
+                        if result.get("Type") in ["Movie", "Series"]:
+                            yield self.get_iteminfo(result.get("Id"))
+                        elif "Folder" in result.get("Type"):
+                            for item in self.get_items(result.get("Id")):
+                                yield item
         except Exception as e:
             logger.error(f"连接Users/Items出错：" + str(e))
         yield None
@@ -761,50 +761,50 @@ class Jellyfin:
         req_url = (f"{self._host}Users/{user}/Items/Resume?"
                    f"Limit=100&MediaTypes=Video&api_key={self._apikey}&Fields=ProductionYear,Path")
         try:
-            res = RequestUtils().get_res(req_url)
-            if res:
-                result = res.json().get("Items") or []
-                ret_resume = []
-                # 用户媒体库文件夹列表（排除黑名单）
-                library_folders = self.get_user_library_folders()
-                for item in result:
-                    if len(ret_resume) == num:
-                        break
-                    if item.get("Type") not in ["Movie", "Episode"]:
-                        continue
-                    item_path = item.get("Path")
-                    if item_path and library_folders and not any(
-                            str(item_path).startswith(folder) for folder in library_folders):
-                        continue
-                    item_type = MediaType.MOVIE.value if item.get("Type") == "Movie" else MediaType.TV.value
-                    link = self.get_play_url(item.get("Id"))
-                    if item.get("BackdropImageTags"):
-                        image = self.__get_backdrop_url(item_id=item.get("Id"),
-                                                        image_tag=item.get("BackdropImageTags")[0])
-                    else:
-                        image = self.__get_local_image_by_id(item.get("Id"))
-                    # 小部分剧集无[xxx-S01E01-thumb.jpg]图片
-                    image_res = RequestUtils().get_res(image)
-                    if not image_res or image_res.status_code == 404:
-                        image = self.generate_image_link(item.get("Id"), "Backdrop", False)
-                    if item_type == MediaType.MOVIE.value:
-                        title = item.get("Name")
-                        subtitle = item.get("ProductionYear")
-                    else:
-                        title = f'{item.get("SeriesName")}'
-                        subtitle = f'S{item.get("ParentIndexNumber")}:{item.get("IndexNumber")} - {item.get("Name")}'
-                    ret_resume.append(schemas.MediaServerPlayItem(
-                        id=item.get("Id"),
-                        title=title,
-                        subtitle=subtitle,
-                        type=item_type,
-                        image=image,
-                        link=link,
-                        percent=item.get("UserData", {}).get("PlayedPercentage")
-                    ))
-                return ret_resume
-            else:
-                logger.error(f"Users/Items/Resume 未获取到返回数据")
+            with RequestUtils().get_res(req_url) as res:
+                if res:
+                    result = res.json().get("Items") or []
+                    ret_resume = []
+                    # 用户媒体库文件夹列表（排除黑名单）
+                    library_folders = self.get_user_library_folders()
+                    for item in result:
+                        if len(ret_resume) == num:
+                            break
+                        if item.get("Type") not in ["Movie", "Episode"]:
+                            continue
+                        item_path = item.get("Path")
+                        if item_path and library_folders and not any(
+                                str(item_path).startswith(folder) for folder in library_folders):
+                            continue
+                        item_type = MediaType.MOVIE.value if item.get("Type") == "Movie" else MediaType.TV.value
+                        link = self.get_play_url(item.get("Id"))
+                        if item.get("BackdropImageTags"):
+                            image = self.__get_backdrop_url(item_id=item.get("Id"),
+                                                            image_tag=item.get("BackdropImageTags")[0])
+                        else:
+                            image = self.__get_local_image_by_id(item.get("Id"))
+                        # 小部分剧集无[xxx-S01E01-thumb.jpg]图片
+                        with RequestUtils().get_res(image) as image_res:
+                            if not image_res or image_res.status_code == 404:
+                                image = self.generate_image_link(item.get("Id"), "Backdrop", False)
+                            if item_type == MediaType.MOVIE.value:
+                                title = item.get("Name")
+                                subtitle = item.get("ProductionYear")
+                            else:
+                                title = f'{item.get("SeriesName")}'
+                                subtitle = f'S{item.get("ParentIndexNumber")}:{item.get("IndexNumber")} - {item.get("Name")}'
+                            ret_resume.append(schemas.MediaServerPlayItem(
+                                id=item.get("Id"),
+                                title=title,
+                                subtitle=subtitle,
+                                type=item_type,
+                                image=image,
+                                link=link,
+                                percent=item.get("UserData", {}).get("PlayedPercentage")
+                            ))
+                    return ret_resume
+                else:
+                    logger.error(f"Users/Items/Resume 未获取到返回数据")
         except Exception as e:
             logger.error(f"连接Users/Items/Resume出错：" + str(e))
         return []
@@ -822,35 +822,35 @@ class Jellyfin:
         req_url = (f"{self._host}Users/{user}/Items/Latest?"
                    f"Limit=100&MediaTypes=Video&api_key={self._apikey}&Fields=ProductionYear,Path")
         try:
-            res = RequestUtils().get_res(req_url)
-            if res:
-                result = res.json() or []
-                ret_latest = []
-                # 用户媒体库文件夹列表（排除黑名单）
-                library_folders = self.get_user_library_folders()
-                for item in result:
-                    if len(ret_latest) == num:
-                        break
-                    if item.get("Type") not in ["Movie", "Series"]:
-                        continue
-                    item_path = item.get("Path")
-                    if item_path and library_folders and not any(
-                            str(item_path).startswith(folder) for folder in library_folders):
-                        continue
-                    item_type = MediaType.MOVIE.value if item.get("Type") == "Movie" else MediaType.TV.value
-                    link = self.get_play_url(item.get("Id"))
-                    image = self.__get_local_image_by_id(item_id=item.get("Id"))
-                    ret_latest.append(schemas.MediaServerPlayItem(
-                        id=item.get("Id"),
-                        title=item.get("Name"),
-                        subtitle=item.get("ProductionYear"),
-                        type=item_type,
-                        image=image,
-                        link=link
-                    ))
-                return ret_latest
-            else:
-                logger.error(f"Users/Items/Latest 未获取到返回数据")
+            with RequestUtils().get_res(req_url) as res:
+                if res:
+                    result = res.json() or []
+                    ret_latest = []
+                    # 用户媒体库文件夹列表（排除黑名单）
+                    library_folders = self.get_user_library_folders()
+                    for item in result:
+                        if len(ret_latest) == num:
+                            break
+                        if item.get("Type") not in ["Movie", "Series"]:
+                            continue
+                        item_path = item.get("Path")
+                        if item_path and library_folders and not any(
+                                str(item_path).startswith(folder) for folder in library_folders):
+                            continue
+                        item_type = MediaType.MOVIE.value if item.get("Type") == "Movie" else MediaType.TV.value
+                        link = self.get_play_url(item.get("Id"))
+                        image = self.__get_local_image_by_id(item_id=item.get("Id"))
+                        ret_latest.append(schemas.MediaServerPlayItem(
+                            id=item.get("Id"),
+                            title=item.get("Name"),
+                            subtitle=item.get("ProductionYear"),
+                            type=item_type,
+                            image=image,
+                            link=link
+                        ))
+                    return ret_latest
+                else:
+                    logger.error(f"Users/Items/Latest 未获取到返回数据")
         except Exception as e:
             logger.error(f"连接Users/Items/Latest出错：" + str(e))
         return []

app/modules/plex/plex.py

@@ -4,7 +4,7 @@ from pathlib import Path
 from typing import List, Optional, Dict, Tuple, Generator, Any
 from urllib.parse import quote_plus
 
-from plexapi import media
+from plexapi import media, utils
 from plexapi.server import PlexServer
 
 from app import schemas
@@ -142,7 +142,11 @@ class Plex:
             return schemas.Statistic()
         sections = self._plex.library.sections()
         MovieCount = SeriesCount = EpisodeCount = 0
+        # 媒体库白名单
+        allow_library = [lib.id for lib in self.get_librarys()]
         for sec in sections:
+            if str(sec.key) not in allow_library:
+                continue
             if sec.type == "movie":
                 MovieCount += sec.totalSize
             if sec.type == "show":
@@ -610,7 +614,11 @@ class Plex:
         """
         if not self._plex:
             return []
-        items = self._plex.fetchItems('/hubs/continueWatching/items', container_start=0, container_size=num)
+        # 媒体库白名单
+        allow_library = ",".join([lib.id for lib in self.get_librarys()])
+        query = {'contentDirectoryID': allow_library}
+        path = '/hubs/continueWatching/items' + utils.joinArgs(query)
+        items = self._plex.fetchItems(path, container_start=0, container_size=num)
         ret_resume = []
         for item in items:
             item_type = MediaType.MOVIE.value if item.TYPE == "movie" else MediaType.TV.value

app/modules/qbittorrent/qbittorrent.py

@@ -133,7 +133,7 @@ class Qbittorrent:
         except Exception as err:
             logger.error(f"删除种子Tag出错：{str(err)}")
             return False
-        
+
     def remove_torrents_tag(self, ids: Union[str, list], tag: Union[str, list]) -> bool:
         """
         移除种子Tag
@@ -148,7 +148,7 @@ class Qbittorrent:
         except Exception as err:
             logger.error(f"移除种子Tag出错：{str(err)}")
             return False
-        
+
     def set_torrents_tag(self, ids: Union[str, list], tags: list):
         """
         设置种子状态为已整理，以及是否强制做种
@@ -372,6 +372,24 @@ class Qbittorrent:
             logger.error(f"设置速度限制出错：{str(err)}")
             return False
 
+    def get_speed_limit(self) -> Optional[Tuple[float, float]]:
+        """
+        获取QB速度
+        :return: 返回download_limit 和upload_limit ，默认是0
+        """
+        if not self.qbc:
+            return None
+
+        download_limit = 0
+        upload_limit = 0
+        try:
+            download_limit = self.qbc.transfer.download_limit
+            upload_limit = self.qbc.transfer.upload_limit
+        except Exception as err:
+            logger.error(f"获取速度限制出错：{str(err)}")
+
+        return download_limit / 1024, upload_limit / 1024
+
     def recheck_torrents(self, ids: Union[str, list]) -> bool:
         """
         重新校验种子

app/modules/slack/slack.py

@@ -41,32 +41,32 @@ class Slack:
         # 注册消息响应
         @slack_app.event("message")
         def slack_message(message):
-            local_res = requests.post(self._ds_url, json=message, timeout=10)
-            logger.debug("message: %s processed, response is: %s" % (message, local_res.text))
+            with requests.post(self._ds_url, json=message, timeout=10) as local_res:
+                logger.debug("message: %s processed, response is: %s" % (message, local_res.text))
 
         @slack_app.action(re.compile(r"actionId-\d+"))
         def slack_action(ack, body):
             ack()
-            local_res = requests.post(self._ds_url, json=body, timeout=60)
-            logger.debug("message: %s processed, response is: %s" % (body, local_res.text))
+            with requests.post(self._ds_url, json=body, timeout=60) as local_res:
+                logger.debug("message: %s processed, response is: %s" % (body, local_res.text))
 
         @slack_app.event("app_mention")
         def slack_mention(say, body):
             say(f"收到，请稍等... <@{body.get('event', {}).get('user')}>")
-            local_res = requests.post(self._ds_url, json=body, timeout=10)
-            logger.debug("message: %s processed, response is: %s" % (body, local_res.text))
+            with requests.post(self._ds_url, json=body, timeout=10) as local_res:
+                logger.debug("message: %s processed, response is: %s" % (body, local_res.text))
 
         @slack_app.shortcut(re.compile(r"/*"))
         def slack_shortcut(ack, body):
             ack()
-            local_res = requests.post(self._ds_url, json=body, timeout=10)
-            logger.debug("message: %s processed, response is: %s" % (body, local_res.text))
+            with requests.post(self._ds_url, json=body, timeout=10) as local_res:
+                logger.debug("message: %s processed, response is: %s" % (body, local_res.text))
 
         @slack_app.command(re.compile(r"/*"))
         def slack_command(ack, body):
             ack()
-            local_res = requests.post(self._ds_url, json=body, timeout=10)
-            logger.debug("message: %s processed, response is: %s" % (body, local_res.text))
+            with requests.post(self._ds_url, json=body, timeout=10) as local_res:
+                logger.debug("message: %s processed, response is: %s" % (body, local_res.text))
 
         # 启动服务
         try:

app/modules/synologychat/synologychat.py

@@ -183,7 +183,7 @@ class SynologyChat:
         ret = self._req.get_res(url=req_url)
         if ret and ret.status_code == 200:
             users = ret.json().get("data", {}).get("users", []) or []
-            return [user.get("user_id") for user in users]
+            return [user.get("user_id") for user in users if user.get("deleted", True) is False]
         else:
             return []
 

app/modules/themoviedb/__init__.py

@@ -1,6 +1,8 @@
 from pathlib import Path
 from typing import Optional, List, Tuple, Union
 
+import cn2an
+
 from app import schemas
 from app.core.config import settings
 from app.core.context import MediaInfo
@@ -10,7 +12,7 @@ from app.modules import _ModuleBase
 from app.modules.themoviedb.category import CategoryHelper
 from app.modules.themoviedb.scraper import TmdbScraper
 from app.modules.themoviedb.tmdb_cache import TmdbCache
-from app.modules.themoviedb.tmdbapi import TmdbHelper
+from app.modules.themoviedb.tmdbapi import TmdbApi
 from app.schemas.types import MediaType, MediaImageType
 from app.utils.http import RequestUtils
 from app.utils.system import SystemUtils
@@ -24,7 +26,7 @@ class TheMovieDbModule(_ModuleBase):
     # 元数据缓存
     cache: TmdbCache = None
     # TMDB
-    tmdb: TmdbHelper = None
+    tmdb: TmdbApi = None
     # 二级分类
     category: CategoryHelper = None
     # 刮削器
@@ -32,12 +34,13 @@ class TheMovieDbModule(_ModuleBase):
 
     def init_module(self) -> None:
         self.cache = TmdbCache()
-        self.tmdb = TmdbHelper()
+        self.tmdb = TmdbApi()
         self.category = CategoryHelper()
         self.scraper = TmdbScraper(self.tmdb)
 
     def stop(self):
         self.cache.save()
+        self.tmdb.close()
 
     def test(self) -> Tuple[bool, str]:
         """
@@ -67,63 +70,77 @@ class TheMovieDbModule(_ModuleBase):
         :param cache:    是否使用缓存
         :return: 识别的媒体信息，包括剧集信息
         """
-        if settings.RECOGNIZE_SOURCE != "themoviedb":
+        if not tmdbid and not meta:
+            return None
+
+        if meta and not tmdbid \
+                and settings.RECOGNIZE_SOURCE != "themoviedb":
             return None
 
         if not meta:
+            # 未提供元数据时，直接使用tmdbid查询，不使用缓存
             cache_info = {}
         elif not meta.name:
             logger.warn("识别媒体信息时未提供元数据名称")
             return None
         else:
+            # 读取缓存
             if mtype:
                 meta.type = mtype
             if tmdbid:
                 meta.tmdbid = tmdbid
-            # 读取缓存
             cache_info = self.cache.get(meta)
+
+        # 识别匹配
         if not cache_info or not cache:
             # 缓存没有或者强制不使用缓存
             if tmdbid:
                 # 直接查询详情
                 info = self.tmdb.get_info(mtype=mtype, tmdbid=tmdbid)
             elif meta:
-                if meta.begin_season:
-                    logger.info(f"正在识别 {meta.name} 第{meta.begin_season}季 ...")
-                else:
-                    logger.info(f"正在识别 {meta.name} ...")
-                if meta.type == MediaType.UNKNOWN and not meta.year:
-                    info = self.tmdb.match_multi(meta.name)
-                else:
-                    if meta.type == MediaType.TV:
-                        # 确定是电视
-                        info = self.tmdb.match(name=meta.name,
-                                               year=meta.year,
-                                               mtype=meta.type,
-                                               season_year=meta.year,
-                                               season_number=meta.begin_season)
-                        if not info:
-                            # 去掉年份再查一次
-                            info = self.tmdb.match(name=meta.name,
-                                                   mtype=meta.type)
+                info = {}
+                # 使用中英文名分别识别，去重去空，但要保持顺序
+                names = list(dict.fromkeys([k for k in [meta.cn_name, meta.en_name] if k]))
+                for name in names:
+                    if meta.begin_season:
+                        logger.info(f"正在识别 {name} 第{meta.begin_season}季 ...")
                     else:
-                        # 有年份先按电影查
-                        info = self.tmdb.match(name=meta.name,
-                                               year=meta.year,
-                                               mtype=MediaType.MOVIE)
-                        # 没有再按电视剧查
-                        if not info:
-                            info = self.tmdb.match(name=meta.name,
+                        logger.info(f"正在识别 {name} ...")
+                    if meta.type == MediaType.UNKNOWN and not meta.year:
+                        info = self.tmdb.match_multi(name)
+                    else:
+                        if meta.type == MediaType.TV:
+                            # 确定是电视
+                            info = self.tmdb.match(name=name,
                                                    year=meta.year,
-                                                   mtype=MediaType.TV)
-                        if not info:
-                            # 去掉年份和类型再查一次
-                            info = self.tmdb.match_multi(name=meta.name)
+                                                   mtype=meta.type,
+                                                   season_year=meta.year,
+                                                   season_number=meta.begin_season)
+                            if not info:
+                                # 去掉年份再查一次
+                                info = self.tmdb.match(name=name,
+                                                       mtype=meta.type)
+                        else:
+                            # 有年份先按电影查
+                            info = self.tmdb.match(name=name,
+                                                   year=meta.year,
+                                                   mtype=MediaType.MOVIE)
+                            # 没有再按电视剧查
+                            if not info:
+                                info = self.tmdb.match(name=name,
+                                                       year=meta.year,
+                                                       mtype=MediaType.TV)
+                            if not info:
+                                # 去掉年份和类型再查一次
+                                info = self.tmdb.match_multi(name=name)
 
-                if not info:
-                    # 从网站查询
-                    info = self.tmdb.match_web(name=meta.name,
-                                               mtype=meta.type)
+                    if not info:
+                        # 从网站查询
+                        info = self.tmdb.match_web(name=name,
+                                                   mtype=meta.type)
+                    if info:
+                        # 查到就退出
+                        break
                 # 补充全量信息
                 if info and not info.get("genres"):
                     info = self.tmdb.get_info(mtype=info.get("media_type"),
@@ -131,6 +148,7 @@ class TheMovieDbModule(_ModuleBase):
             else:
                 logger.error("识别媒体信息时未提供元数据或tmdbid")
                 return None
+
             # 保存到缓存
             if meta:
                 self.cache.update(meta, info)
@@ -182,7 +200,7 @@ class TheMovieDbModule(_ModuleBase):
         :param season:  季号
         """
         # 搜索
-        logger.info(f"开始使用 名称：{name}、年份：{year} 匹配TMDB信息 ...")
+        logger.info(f"开始使用 名称：{name} 年份：{year} 匹配TMDB信息 ...")
         info = self.tmdb.match(name=name,
                                year=year,
                                mtype=mtype,
@@ -230,15 +248,26 @@ class TheMovieDbModule(_ModuleBase):
                 results = self.tmdb.search_movies(meta.name, meta.year)
             else:
                 results = self.tmdb.search_tvs(meta.name, meta.year)
-
-        return [MediaInfo(tmdb_info=info) for info in results]
+        # 将搜索词中的季写入标题中
+        if results:
+            medias = [MediaInfo(tmdb_info=info) for info in results]
+            if meta.begin_season:
+                # 小写数据转大写
+                season_str = cn2an.an2cn(meta.begin_season, "low")
+                for media in medias:
+                    if media.type == MediaType.TV:
+                        media.title = f"{media.title} 第{season_str}季"
+                        media.season = meta.begin_season
+            return medias
+        return []
 
     def scrape_metadata(self, path: Path, mediainfo: MediaInfo, transfer_type: str,
-                        force_nfo: bool = False, force_img: bool = False) -> None:
+                        metainfo: MetaBase = None, force_nfo: bool = False, force_img: bool = False) -> None:
         """
         刮削元数据
         :param path: 媒体文件路径
         :param mediainfo:  识别的媒体信息
+        :param metainfo: 源文件的识别元数据
         :param transfer_type:  转移类型
         :param force_nfo:  强制刮削nfo
         :param force_img:  强制刮削图片
@@ -254,6 +283,7 @@ class TheMovieDbModule(_ModuleBase):
             self.scraper.gen_scraper_files(mediainfo=mediainfo,
                                            file_path=scrape_path,
                                            transfer_type=transfer_type,
+                                           metainfo=metainfo,
                                            force_nfo=force_nfo,
                                            force_img=force_img)
         elif path.is_file():
@@ -262,6 +292,7 @@ class TheMovieDbModule(_ModuleBase):
             self.scraper.gen_scraper_files(mediainfo=mediainfo,
                                            file_path=path,
                                            transfer_type=transfer_type,
+                                           metainfo=metainfo,
                                            force_nfo=force_nfo,
                                            force_img=force_img)
         else:
@@ -397,15 +428,15 @@ class TheMovieDbModule(_ModuleBase):
         # 图片相对路径
         image_path = None
         image_prefix = image_prefix or "w500"
-        if not season and not episode:
+        if season is None and not episode:
             tmdbinfo = self.tmdb.get_info(mtype=mtype, tmdbid=int(mediaid))
             if tmdbinfo:
                 image_path = tmdbinfo.get(image_type.value)
-        elif season and episode:
+        elif season is not None and episode:
             episodeinfo = self.tmdb.get_tv_episode_detail(tmdbid=int(mediaid), season=season, episode=episode)
             if episodeinfo:
                 image_path = episodeinfo.get("still_path")
-        elif season:
+        elif season is not None:
             seasoninfo = self.tmdb.get_tv_season_detail(tmdbid=int(mediaid), season=season)
             if seasoninfo:
                 image_path = seasoninfo.get(image_type.value)

app/modules/themoviedb/scraper.py

@@ -1,4 +1,3 @@
-import time
 import traceback
 from pathlib import Path
 from typing import Union
@@ -8,6 +7,7 @@ from requests import RequestException
 
 from app.core.config import settings
 from app.core.context import MediaInfo
+from app.core.meta import MetaBase
 from app.core.metainfo import MetaInfo
 from app.log import logger
 from app.schemas.types import MediaType
@@ -27,16 +27,20 @@ class TmdbScraper:
         self.tmdb = tmdb
 
     def gen_scraper_files(self, mediainfo: MediaInfo, file_path: Path, transfer_type: str,
-                          force_nfo: bool = False, force_img: bool = False):
+                          metainfo: MetaBase = None, force_nfo: bool = False, force_img: bool = False):
         """
         生成刮削文件，包括NFO和图片，传入路径为文件路径
         :param mediainfo: 媒体信息
+        :param metainfo: 源文件的识别元数据
         :param file_path: 文件路径或者目录路径
         :param transfer_type: 传输类型
         :param force_nfo: 是否强制生成NFO
         :param force_img: 是否强制生成图片
         """
 
+        if not mediainfo or not file_path:
+            return
+
         self._transfer_type = transfer_type
         self._force_nfo = force_nfo
         self._force_img = force_img
@@ -73,8 +77,10 @@ class TmdbScraper:
                                               file_path=image_path)
             # 电视剧，路径为每一季的文件名 名称/Season xx/名称 SxxExx.xxx
             else:
-                # 识别
-                meta = MetaInfo(file_path.stem)
+                # 如果有上游传入的元信息则使用，否则使用文件名识别
+                meta = metainfo or MetaInfo(file_path.name)
+                if meta.begin_season is None:
+                    meta.begin_season = mediainfo.season if mediainfo.season is not None else 1
                 # 根目录不存在时才处理
                 if self._force_nfo or not file_path.parent.with_name("tvshow.nfo").exists():
                     # 根目录描述文件
@@ -151,10 +157,6 @@ class TmdbScraper:
         """
         生成公共NFO
         """
-        # 添加时间
-        DomUtils.add_node(doc, root, "dateadded",
-                          time.strftime('%Y-%m-%d %H:%M:%S',
-                                        time.localtime(time.time())))
         # TMDB
         DomUtils.add_node(doc, root, "tmdbid", mediainfo.tmdb_id or "")
         uniqueid_tmdb = DomUtils.add_node(doc, root, "uniqueid", mediainfo.tmdb_id or "")
@@ -267,9 +269,6 @@ class TmdbScraper:
         logger.info(f"正在生成季NFO文件：{season_path.name}")
         doc = minidom.Document()
         root = DomUtils.add_node(doc, doc, "season")
-        # 添加时间
-        DomUtils.add_node(doc, root, "dateadded",
-                          time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(time.time())))
         # 简介
         xplot = DomUtils.add_node(doc, root, "plot")
         xplot.appendChild(doc.createCDATASection(seasoninfo.get("overview") or ""))
@@ -306,8 +305,6 @@ class TmdbScraper:
         logger.info(f"正在生成剧集NFO文件：{file_path.name}")
         doc = minidom.Document()
         root = DomUtils.add_node(doc, doc, "episodedetails")
-        # 添加时间
-        DomUtils.add_node(doc, root, "dateadded", time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(time.time())))
         # TMDBID
         uniqueid = DomUtils.add_node(doc, root, "uniqueid", str(episodeinfo.get("id")))
         uniqueid.setAttribute("type", "tmdb")

app/modules/themoviedb/tmdbapi.py

@@ -15,7 +15,7 @@ from .tmdbv3api import TMDb, Search, Movie, TV, Season, Episode, Discover, Trend
 from .tmdbv3api.exceptions import TMDbException
 
 
-class TmdbHelper:
+class TmdbApi:
     """
     TMDB识别匹配
     """
@@ -189,9 +189,16 @@ class TmdbHelper:
                                                   season_year,
                                                   season_number)
             if not info:
-                logger.debug(
-                    f"正在识别{mtype.value}：{name}, 年份={year} ...")
-                info = self.__search_tv_by_name(name, year)
+                year_range = [year]
+                if year:
+                    year_range.append(str(int(year) + 1))
+                    year_range.append(str(int(year) - 1))
+                for year in year_range:
+                    logger.debug(
+                        f"正在识别{mtype.value}：{name}, 年份={year} ...")
+                    info = self.__search_tv_by_name(name, year)
+                    if info:
+                        break
             if info:
                 info['media_type'] = MediaType.TV
         # 返回
@@ -1020,7 +1027,7 @@ class TmdbHelper:
         if not self.episode:
             return {}
         try:
-            logger.info("正在查询TMDB集图片：%s，季：%s，集：%s ..." % (tmdbid, season, episode))
+            logger.info("正在查询TMDB集详情：%s，季：%s，集：%s ..." % (tmdbid, season, episode))
             tmdbinfo = self.episode.details(tv_id=tmdbid, season_num=season, episode_num=episode)
             return tmdbinfo or {}
         except Exception as e:
@@ -1264,3 +1271,9 @@ class TmdbHelper:
         except Exception as e:
             print(str(e))
             return {}
+
+    def close(self):
+        """
+        关闭连接
+        """
+        self.tmdb.close()

app/modules/themoviedb/tmdbv3api/tmdb.py

@@ -222,6 +222,6 @@ class TMDb(object):
             return json.get(key)
         return json
 
-    def __del__(self):
+    def close(self):
         if self._session:
             self._session.close()

app/modules/thetvdb/__init__.py

@@ -17,7 +17,7 @@ class TheTvDbModule(_ModuleBase):
                                  proxies=settings.PROXY)
 
     def stop(self):
-        pass
+        self.tvdb.close()
 
     def test(self) -> Tuple[bool, str]:
         """

app/modules/thetvdb/tvdbapi.py

@@ -733,6 +733,10 @@ class Tvdb:
         }
         self.proxies = proxies
 
+    def close(self):
+        if self.session:
+            self.session.close()
+
     @staticmethod
     def _getTempDir():
         """Returns the [system temp dir]/tvdb_api-u501 (or
@@ -764,17 +768,17 @@ class Tvdb:
         if not self.__authorized:
             # only authorize of we haven't before and we
             # don't have the url in the cache
-            fake_session_for_key = requests.Session()
-            fake_session_for_key.headers['Accept-Language'] = language
             cache_key = None
-            try:
-                # in case the session class has no cache object, fail gracefully
-                cache_key = self.session.cache.create_key(
-                    fake_session_for_key.prepare_request(requests.Request('GET', url))
-                )
-            except Exception:
-                # FIXME: Can this just check for hasattr(self.session, "cache") instead?
-                pass
+            with requests.Session() as fake_session_for_key:
+                fake_session_for_key.headers['Accept-Language'] = language
+                try:
+                    # in case the session class has no cache object, fail gracefully
+                    cache_key = self.session.cache.create_key(
+                        fake_session_for_key.prepare_request(requests.Request('GET', url))
+                    )
+                except Exception:
+                    # FIXME: Can this just check for hasattr(self.session, "cache") instead?
+                    pass
 
             # fmt: off
             # No fmt because mangles noqa comment - https://github.com/psf/black/issues/195

app/modules/transmission/transmission.py

@@ -1,4 +1,4 @@
-from typing import Optional, Union, Tuple, List
+from typing import Optional, Union, Tuple, List, Dict
 
 import transmission_rpc
 from transmission_rpc import Client, Torrent, File
@@ -18,7 +18,8 @@ class Transmission:
     trc: Optional[Client] = None
 
     # 参考transmission web，仅查询需要的参数，加速种子搜索
-    _trarg = ["id", "name", "status", "labels", "hashString", "totalSize", "percentDone", "addedDate", "trackerStats",
+    _trarg = ["id", "name", "status", "labels", "hashString", "totalSize", "percentDone", "addedDate", "trackerList",
+              "trackerStats",
               "leftUntilDone", "rateDownload", "rateUpload", "recheckProgress", "rateDownload", "rateUpload",
               "peersGettingFromUs", "peersSendingToUs", "uploadRatio", "uploadedEver", "downloadedEver", "downloadDir",
               "error", "errorString", "doneDate", "queuePosition", "activityDate", "trackers"]
@@ -289,6 +290,29 @@ class Transmission:
             logger.error(f"设置速度限制出错：{str(err)}")
             return False
 
+    def get_speed_limit(self) -> Optional[Tuple[float, float]]:
+        """
+        获取TR速度
+        :return: download_limit 下载速度 默认是0
+                 upload_limit 上传速度   默认是0
+        """
+        if not self.trc:
+            return None
+
+        download_limit = 0
+        upload_limit = 0
+        try:
+            download_limit = self.trc.get_session().get('speed_limit_down')
+            upload_limit = self.trc.get_session().get('speed_limit_up')
+
+        except Exception as err:
+            logger.error(f"获取速度限制出错：{str(err)}")
+
+        return (
+            download_limit,
+            upload_limit
+        )
+
     def recheck_torrents(self, ids: Union[str, list]) -> bool:
         """
         重新校验种子
@@ -373,3 +397,15 @@ class Transmission:
             logger.error(f"修改tracker出错：{str(err)}")
             return False
 
+    def get_session(self) -> Dict[str, Union[int, bool, str]]:
+        """
+        获取Transmission当前的会话信息和配置设置
+        :return dict or False
+        """
+        if not self.trc:
+            return False
+        try:
+            return self.trc.get_session()
+        except Exception as err:
+            logger.error(f"获取session出错：{str(err)}")
+            return False

app/modules/wechat/wechat.py

@@ -71,18 +71,18 @@ class WeChat:
                 return None
             try:
                 token_url = self._token_url % (self._corpid, self._appsecret)
-                res = RequestUtils().get_res(token_url)
-                if res:
-                    ret_json = res.json()
-                    if ret_json.get('errcode') == 0:
-                        self._access_token = ret_json.get('access_token')
-                        self._expires_in = ret_json.get('expires_in')
-                        self._access_token_time = datetime.now()
-                elif res is not None:
-                    logger.error(f"获取微信access_token失败，错误码：{res.status_code}，错误原因：{res.reason}")
-                else:
-                    logger.error(f"获取微信access_token失败，未获取到返回信息")
-                    raise Exception("获取微信access_token失败，网络连接失败")
+                with RequestUtils().get_res(token_url) as res:
+                    if res:
+                        ret_json = res.json()
+                        if ret_json.get('errcode') == 0:
+                            self._access_token = ret_json.get('access_token')
+                            self._expires_in = ret_json.get('expires_in')
+                            self._access_token_time = datetime.now()
+                    elif res is not None:
+                        logger.error(f"获取微信access_token失败，错误码：{res.status_code}，错误原因：{res.reason}")
+                    else:
+                        logger.error(f"获取微信access_token失败，未获取到返回信息")
+                        raise Exception("获取微信access_token失败，网络连接失败")
             except Exception as e:
                 logger.error(f"获取微信access_token失败，错误信息：{str(e)}")
                 return None

app/plugins/__init__.py

@@ -32,6 +32,8 @@ class _PluginBase(metaclass=ABCMeta):
     plugin_name: str = ""
     # 插件描述
     plugin_desc: str = ""
+    # 插件顺序
+    plugin_order: int = 9999
 
     def __init__(self):
         # 插件数据

app/scheduler.py

@@ -83,6 +83,13 @@ class Scheduler(metaclass=Singleton):
                     "state": "R"
                 }
             },
+            "new_subscribe_search": {
+                "func": SubscribeChain().search,
+                "running": False,
+                "kwargs": {
+                    "state": "N"
+                }
+            },
             "subscribe_refresh": {
                 "func": SubscribeChain().refresh,
                 "running": False,
@@ -144,10 +151,11 @@ class Scheduler(metaclass=Singleton):
         self._scheduler.add_job(
             self.start,
             "interval",
+            id="new_subscribe_search",
+            name="新增订阅搜索",
             minutes=5,
             kwargs={
-                'job_id': 'subscribe_search',
-                'state': 'N'
+                'job_id': 'new_subscribe_search'
             }
         )
 
@@ -169,17 +177,16 @@ class Scheduler(metaclass=Singleton):
                 self.start,
                 "interval",
                 id="subscribe_search",
-                name="订阅搜索",
+                name="订阅搜索补全",
                 hours=24,
                 kwargs={
-                    'job_id': 'subscribe_search',
-                    'state': 'R'
+                    'job_id': 'subscribe_search'
                 }
             )
 
         if settings.SUBSCRIBE_MODE == "spider":
             # 站点首页种子定时刷新模式
-            triggers = TimerUtils.random_scheduler(num_executions=30)
+            triggers = TimerUtils.random_scheduler(num_executions=32)
             for trigger in triggers:
                 self._scheduler.add_job(
                     self.start,

app/schemas/__init__.py

@@ -5,6 +5,7 @@ from .site import *
 from .subscribe import *
 from .context import *
 from .servarr import *
+from .servcookie import *
 from .plugin import *
 from .history import *
 from .dashboard import *
@@ -13,3 +14,5 @@ from .message import *
 from .tmdb import *
 from .transfer import *
 from .file import *
+from .bangumi import *
+from .douban import *

app/schemas/bangumi.py

@@ -0,0 +1,12 @@
+from typing import Optional
+
+from pydantic import BaseModel
+
+
+class BangumiPerson(BaseModel):
+    id: Optional[int] = None
+    name: Optional[str] = None
+    type: Optional[int] = 1
+    career: Optional[list] = []
+    images: Optional[dict] = {}
+    relation: Optional[str] = None

app/schemas/context.py

@@ -73,7 +73,7 @@ class MediaInfo(BaseModel):
     year: Optional[str] = None
     # 标题（年份）
     title_year: Optional[str] = None
-    # 季
+    # 当前指定季，如有
     season: Optional[int] = None
     # TMDB ID
     tmdb_id: Optional[int] = None
@@ -83,6 +83,8 @@ class MediaInfo(BaseModel):
     tvdb_id: Optional[str] = None
     # 豆瓣ID
     douban_id: Optional[str] = None
+    # Bangumi ID
+    bangumi_id: Optional[int] = None
     # 媒体原语种
     original_language: Optional[str] = None
     # 媒体原发行标题

app/schemas/douban.py

@@ -0,0 +1,14 @@
+from typing import Optional
+
+from pydantic import BaseModel
+
+
+class DoubanPerson(BaseModel):
+    id: Optional[str] = None
+    name: Optional[str] = None
+    roles: Optional[list] = []
+    title: Optional[str] = None
+    url: Optional[str] = None
+    character: Optional[str] = None
+    avatar: Optional[dict] = None
+    latin_name: Optional[str] = None

app/schemas/message.py

@@ -17,6 +17,20 @@ class CommingMessage(BaseModel):
     channel: Optional[MessageChannel] = None
     # 消息体
     text: Optional[str] = None
+    # 时间
+    date: Optional[str] = None
+    # 消息方向
+    action: Optional[int] = 0
+
+    def to_dict(self):
+        """
+        转换为字典
+        """
+        items = self.dict()
+        for k, v in items.items():
+            if isinstance(v, MessageChannel):
+                items[k] = v.value
+        return items
 
 
 class Notification(BaseModel):
@@ -37,6 +51,21 @@ class Notification(BaseModel):
     link: Optional[str] = None
     # 用户ID
     userid: Optional[Union[str, int]] = None
+    # 时间
+    date: Optional[str] = None
+    # 消息方向
+    action: Optional[int] = 1
+
+    def to_dict(self):
+        """
+        转换为字典
+        """
+        items = self.dict()
+        for k, v in items.items():
+            if isinstance(v, MessageChannel) \
+                    or isinstance(v, NotificationType):
+                items[k] = v.value
+        return items
 
 
 class NotificationSwitch(BaseModel):

app/schemas/plugin.py

@@ -38,3 +38,7 @@ class Plugin(BaseModel):
     is_local: Optional[bool] = False
     # 仓库地址
     repo_url: Optional[str] = None
+    # 安装次数
+    install_count: Optional[int] = 0
+    # 更新记录
+    history: Optional[dict] = {}

app/schemas/servcookie.py

@@ -0,0 +1,11 @@
+from fastapi import Query
+from pydantic import BaseModel
+
+
+class CookieData(BaseModel):
+    encrypted: str = Query(min_length=1, max_length=1024 * 1024 * 50)
+    uuid: str = Query(min_length=5, pattern="^[a-zA-Z0-9]+$")
+
+
+class CookiePassword(BaseModel):
+    password: str

app/schemas/site.py

@@ -41,3 +41,23 @@ class Site(BaseModel):
 
     class Config:
         orm_mode = True
+
+
+class SiteStatistic(BaseModel):
+    # 站点ID
+    domain: Optional[str]
+    # 成功次数
+    success: Optional[int] = 0
+    # 失败次数
+    fail: Optional[int] = 0
+    # 平均响应时间
+    seconds: Optional[int] = 0
+    # 最后状态
+    lst_state: Optional[int] = 0
+    # 最后修改时间
+    lst_mod_date: Optional[str]
+    # 备注
+    note: Optional[str] = None
+
+    class Config:
+        orm_mode = True

app/schemas/subscribe.py

@@ -15,6 +15,7 @@ class Subscribe(BaseModel):
     keyword: Optional[str] = None
     tmdbid: Optional[int] = None
     doubanid: Optional[str] = None
+    bangumiid: Optional[int] = None
     # 季号
     season: Optional[int] = None
     # 海报
@@ -61,6 +62,8 @@ class Subscribe(BaseModel):
     save_path: Optional[str] = None
     # 是否使用 imdbid 搜索
     search_imdbid: Optional[int] = 0
+    # 时间
+    date: Optional[str] = None
 
     class Config:
         orm_mode = True

app/schemas/tmdb.py

@@ -49,14 +49,3 @@ class TmdbPerson(BaseModel):
     popularity: Optional[float] = None
     images: Optional[dict] = {}
     biography: Optional[str] = None
-
-
-class DoubanPerson(BaseModel):
-    id: Optional[str] = None
-    name: Optional[str] = None
-    roles: Optional[list] = []
-    title: Optional[str] = None
-    url: Optional[str] = None
-    character: Optional[str] = None
-    avatar: Optional[dict] = None
-    latin_name: Optional[str] = None

app/schemas/types.py

@@ -14,34 +14,38 @@ class TorrentStatus(Enum):
 
 # 可监听事件
 class EventType(Enum):
-    # 插件重载
+    # 插件需要重载
     PluginReload = "plugin.reload"
     # 插件动作
     PluginAction = "plugin.action"
     # 执行命令
     CommandExcute = "command.excute"
-    # 站点删除
+    # 站点已删除
     SiteDeleted = "site.deleted"
-    # Webhook消息
-    WebhookMessage = "webhook.message"
+    # 站点已更新
+    SiteUpdated = "site.updated"
     # 转移完成
     TransferComplete = "transfer.complete"
-    # 添加下载
+    # 下载已添加
     DownloadAdded = "download.added"
     # 删除历史记录
     HistoryDeleted = "history.deleted"
     # 删除下载源文件
     DownloadFileDeleted = "downloadfile.deleted"
-    # 用户外来消息
+    # 收到用户外来消息
     UserMessage = "user.message"
-    # 通知消息
+    # 收到Webhook消息
+    WebhookMessage = "webhook.message"
+    # 发送消息通知
     NoticeMessage = "notice.message"
     # 名称识别请求
     NameRecognize = "name.recognize"
     # 名称识别结果
     NameRecognizeResult = "name.recognize.result"
-    # 缓存站点图标
-    CacheSiteIcon = "cache.siteicon"
+    # 订阅已添加
+    SubscribeAdded = "subscribe.added"
+    # 订阅已完成
+    SubscribeComplete = "subscribe.complete"
 
 
 # 系统配置Key字典
@@ -76,6 +80,8 @@ class SystemConfigKey(Enum):
     DefaultSearchFilterRules = "DefaultSearchFilterRules"
     # 转移屏蔽词
     TransferExcludeWords = "TransferExcludeWords"
+    # 插件安装统计
+    PluginInstallReport = "PluginInstallReport"
 
 
 # 处理进度Key字典
@@ -117,3 +123,4 @@ class MessageChannel(Enum):
     Slack = "Slack"
     SynologyChat = "SynologyChat"
     VoceChat = "VoceChat"
+    Web = "Web"