Merge pull request #1454 from WangEdward/main

This commit is contained in:
jxxghp 2024-02-07 21:11:58 +08:00 committed by GitHub
commit 36122dda31
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -37,7 +37,7 @@ def manual_transfer(path: str = None,
:param type_name: 媒体类型电影/电视剧 :param type_name: 媒体类型电影/电视剧
:param tmdbid: tmdbid :param tmdbid: tmdbid
:param season: 剧集季号 :param season: 剧集季号
:param transfer_type: 转移类型move/copy :param transfer_type: 转移类型move/copy
:param episode_format: 剧集识别格式 :param episode_format: 剧集识别格式
:param episode_detail: 剧集识别详细信息 :param episode_detail: 剧集识别详细信息
:param episode_part: 剧集识别分集信息 :param episode_part: 剧集识别分集信息
@ -56,16 +56,20 @@ def manual_transfer(path: str = None,
return schemas.Response(success=False, message=f"历史记录不存在ID{logid}") return schemas.Response(success=False, message=f"历史记录不存在ID{logid}")
# 强制转移 # 强制转移
force = True force = True
# 源路径 if history.status and ("move" in history.mode):
in_path = Path(history.src) # 重新整理成功的转移,则使用成功的 dest 做 in_path
# 目的路径 in_path = Path(history.dest)
if history.dest and str(history.dest) != "None": else:
# 删除旧的已整理文件 # 源路径
transfer.delete_files(Path(history.dest)) in_path = Path(history.src)
if not target: # 目的路径
target = transfer.get_root_path(path=history.dest, if history.dest and str(history.dest) != "None":
type_name=history.type, # 删除旧的已整理文件
category=history.category) transfer.delete_files(Path(history.dest))
if not target:
target = transfer.get_root_path(path=history.dest,
type_name=history.type,
category=history.category)
elif path: elif path:
in_path = Path(path) in_path = Path(path)
else: else: