From d2c9f7a778793366020793c8d2be86238c6129d6 Mon Sep 17 00:00:00 2001 From: jxxghp Date: Fri, 1 Dec 2023 18:39:40 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20README.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 97d8e31f..c1345032 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ 发布频道:https://t.me/moviepilot_channel ## 主要特性 -- 前后端分离,基于FastApi + Vue3,前端项目地址:[MoviePilot-Frontend](https://github.com/jxxghp/MoviePilot-Frontend) +- 前后端分离,基于FastApi + Vue3,前端项目地址:[MoviePilot-Frontend](https://github.com/jxxghp/MoviePilot-Frontend),API:http://localhost:3001/docs - 聚焦核心需求,简化功能和设置,部分设置项可直接使用默认值。 - 重新设计了用户界面,更加美观易用。 From 024f1de4f149dbae9e2a03ee39262d32266a7d70 Mon Sep 17 00:00:00 2001 From: WithdewHua Date: Sat, 2 Dec 2023 12:30:43 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E6=B8=85=E7=A9=BA=20MediaServerItem?= =?UTF-8?q?=20=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/chain/mediaserver.py | 2 +- app/db/mediaserver_oper.py | 2 +- app/db/models/mediaserver.py | 10 +++++++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/app/chain/mediaserver.py b/app/chain/mediaserver.py index 74235966..720e9d56 100644 --- a/app/chain/mediaserver.py +++ b/app/chain/mediaserver.py @@ -52,7 +52,7 @@ class MediaServerChain(ChainBase): # 汇总统计 total_count = 0 # 清空登记薄 - self.dboper.empty(server=settings.MEDIASERVER) + self.dboper.empty() # 同步黑名单 sync_blacklist = settings.MEDIASERVER_SYNC_BLACKLIST.split( ",") if settings.MEDIASERVER_SYNC_BLACKLIST else [] diff --git a/app/db/mediaserver_oper.py b/app/db/mediaserver_oper.py index d76a5313..d22e4504 100644 --- a/app/db/mediaserver_oper.py +++ b/app/db/mediaserver_oper.py @@ -25,7 +25,7 @@ class MediaServerOper(DbOper): return True return False - def empty(self, server: str): + def empty(self, server: Optional[str] = None): """ 清空媒体服务器数据 """ diff --git a/app/db/models/mediaserver.py b/app/db/models/mediaserver.py index 82164daa..df28d072 100644 --- a/app/db/models/mediaserver.py +++ b/app/db/models/mediaserver.py @@ -1,4 +1,5 @@ from datetime import datetime +from typing import Optional from sqlalchemy import Column, Integer, String, Sequence from sqlalchemy.orm import Session @@ -9,7 +10,7 @@ from app.db.models import Base, db_update class MediaServerItem(Base): """ - 站点表 + 媒体服务器媒体条目表 """ id = Column(Integer, Sequence('id'), primary_key=True, index=True) # 服务器类型 @@ -48,8 +49,11 @@ class MediaServerItem(Base): @staticmethod @db_update - def empty(db: Session, server: str): - db.query(MediaServerItem).filter(MediaServerItem.server == server).delete() + def empty(db: Session, server: Optional[str] = None): + if server is None: + db.query(MediaServerItem).delete() + else: + db.query(MediaServerItem).filter(MediaServerItem.server == server).delete() @staticmethod @db_query