codfrm/MoviePilot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2265 from InfinityPacer/main

Browse Source
This commit is contained in:
jxxghp 2024-06-04 22:00:00 +08:00 committed by GitHub
commit 7e1951b8e4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/chain/transfer.py
View File

@ -360,11 +360,11 @@ class TransferChain(ChainBase):
# 硬链接检查 # 硬链接检查
temp_transfer_type = transfer_type temp_transfer_type = transfer_type
if transfer_type == "link": if transfer_type == "link":
if not SystemUtils.is_same_disk(file_path, transferinfo.target_path): if not SystemUtils.is_same_file(file_path, transferinfo.target_path):
logger.warn( logger.warn(
f"{file_path} 与 {transferinfo.target_path} 不在同一磁盘/存储空间/映射目录，未能硬链接，请检查存储空间占用和整理耗时，确认是否为复制") f"{file_path} 与 {transferinfo.target_path} 不是同一硬链接文件，请检查存储空间占用和整理耗时，确认是否为复制")
self.messagehelper.put( self.messagehelper.put(
f"{file_path} 与 {transferinfo.target_path} 不在同一磁盘/存储空间/映射目录，疑似硬链接失败，请检查是否为复制", f"{file_path} 与 {transferinfo.target_path} 不是同一硬链接文件，疑似硬链接失败，请检查是否为复制",
title="硬链接失败", title="硬链接失败",
role="system") role="system")
temp_transfer_type = "copy" temp_transfer_type = "copy"

16
app/utils/system.py
View File

@ -118,13 +118,14 @@ class SystemUtils:
硬链接 硬链接
""" """
try: try:
# link到当前目录并改名 # 准备目标路径，增加后缀 .mp
tmp_path = src.parent / (dest.name + ".mp") tmp_path = dest.with_suffix(dest.suffix + ".mp")
# 检查目标路径是否已存在，如果存在则先unlink
if tmp_path.exists(): if tmp_path.exists():
tmp_path.unlink() tmp_path.unlink()
tmp_path.hardlink_to(src) tmp_path.hardlink_to(src)
# 移动到目标目录 # 硬链接完成，移除 .mp 后缀
shutil.move(tmp_path, dest) tmp_path.rename(dest)
return 0, "" return 0, ""
except Exception as err: except Exception as err:
print(str(err)) print(str(err))
@ -466,6 +467,13 @@ class SystemUtils:
print(str(err)) print(str(err))
return False, f"重启时发生错误：{str(err)}" return False, f"重启时发生错误：{str(err)}"
@staticmethod
def is_same_file(src: Path, dest: Path) -> bool:
"""判断是否为同一个文件"""
if not src.exists() or not dest.exists():
return False
return src.samefile(dest)
@staticmethod @staticmethod
def is_same_disk(src: Path, dest: Path) -> bool: def is_same_disk(src: Path, dest: Path) -> bool:
""" """