nas/MoviePilot
1
0
Fork 0
mirror of https://github.com/jxxghp/MoviePilot.git synced 2026-04-01 18:01:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix 统一整理记录名称

Browse Source
This commit is contained in:
jxxghp
2024-12-27 07:58:58 +08:00
parent 22c485d177
commit 75bb52ccca
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/api/endpoints/history.py
View File

@@ -41,7 +41,7 @@ def delete_download_history(history_in: schemas.DownloadHistory,
return schemas.Response(success=True)
@router.get("/transfer", summary="查询转移历史记录", response_model=schemas.Response)
@router.get("/transfer", summary="查询整理记录", response_model=schemas.Response)
def transfer_history(title: str = None,
page: int = 1,
count: int = 30,
@@ -49,7 +49,7 @@ def transfer_history(title: str = None,
db: Session = Depends(get_db),
_: schemas.TokenPayload = Depends(verify_token)) -> Any:
"""
查询转移历史记录
查询整理记录
"""
if title == "失败":
title = None
@@ -76,14 +76,14 @@ def transfer_history(title: str = None,
})
@router.delete("/transfer", summary="删除转移历史记录", response_model=schemas.Response)
@router.delete("/transfer", summary="删除整理记录", response_model=schemas.Response)
def delete_transfer_history(history_in: schemas.TransferHistory,
deletesrc: bool = False,
deletedest: bool = False,
db: Session = Depends(get_db),
_: schemas.TokenPayload = Depends(get_current_active_superuser)) -> Any:
"""
删除转移历史记录
删除整理记录
"""
history: TransferHistory = TransferHistory.get(db, history_in.id)
if not history:
@@ -112,11 +112,11 @@ def delete_transfer_history(history_in: schemas.TransferHistory,
return schemas.Response(success=True)
@router.get("/empty/transfer", summary="清空转移历史记录", response_model=schemas.Response)
@router.get("/empty/transfer", summary="清空整理记录", response_model=schemas.Response)
def delete_transfer_history(db: Session = Depends(get_db),
_: User = Depends(get_current_active_superuser)) -> Any:
"""
清空转移历史记录
清空整理记录
"""
TransferHistory.truncate(db)
return schemas.Response(success=True)

2
app/api/endpoints/transfer.py
View File

@@ -85,7 +85,7 @@ def manual_transfer(transer_item: ManualTransferItem,
# 查询历史记录
history: TransferHistory = TransferHistory.get(db, transer_item.logid)
if not history:
return schemas.Response(success=False, message=f"历史记录不存在，ID：{transer_item.logid}")
return schemas.Response(success=False, message=f"整理记录不存在，ID：{transer_item.logid}")
# 强制转移
force = True
if history.status and ("move" in history.mode):

8
app/chain/transfer.py
View File

@@ -808,7 +808,7 @@ class TransferChain(ChainBase, metaclass=Singleton):
transferd = self.transferhis.get_by_src(file_item.path, storage=file_item.storage)
if transferd and transferd.status:
all_success = False
logger.info(f"{file_item.path} 已整理过，如需重新处理，请删除历史记录。")
logger.info(f"{file_item.path} 已整理过，如需重新处理，请删除整理记录。")
err_msgs.append(f"{file_item.name} 已整理过")
continue
@@ -977,7 +977,7 @@ class TransferChain(ChainBase, metaclass=Singleton):
def args_error():
self.post_message(Notification(channel=channel, source=source,
title="请输入正确的命令格式：/redo [id] [tmdbid/豆瓣id]|[类型]，"
"[id]历史记录编号", userid=userid))
"[id]整理记录编号", userid=userid))
if not arg_str:
args_error()
@@ -1021,8 +1021,8 @@ class TransferChain(ChainBase, metaclass=Singleton):
# 查询历史记录
history: TransferHistory = self.transferhis.get(logid)
if not history:
logger.error(f"历史记录不存在，ID：{logid}")
return False, "历史记录不存在"
logger.error(f"整理记录不存在，ID：{logid}")
return False, "整理记录不存在"
# 按源目录路径重新整理
src_path = Path(history.src)
if not src_path.exists():

2
app/db/models/transferhistory.py
View File

@@ -8,7 +8,7 @@ from app.db import db_query, db_update, Base
class TransferHistory(Base):
"""
转移历史记录
整理记录
"""
id = Column(Integer, Sequence('id'), primary_key=True, index=True)
# 源路径