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