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

Merge pull request #2355 from InfinityPacer/main

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

18
app/chain/transfer.py
View File

@ -18,7 +18,6 @@ from app.db.systemconfig_oper import SystemConfigOper
from app.db.transferhistory_oper import TransferHistoryOper from app.db.transferhistory_oper import TransferHistoryOper
from app.helper.directory import DirectoryHelper from app.helper.directory import DirectoryHelper
from app.helper.format import FormatParser from app.helper.format import FormatParser
from app.helper.message import MessageHelper
from app.helper.progress import ProgressHelper from app.helper.progress import ProgressHelper
from app.log import logger from app.log import logger
from app.schemas import TransferInfo, TransferTorrent, Notification, EpisodeFormat from app.schemas import TransferInfo, TransferTorrent, Notification, EpisodeFormat
@ -44,7 +43,6 @@ class TransferChain(ChainBase):
self.tmdbchain = TmdbChain() self.tmdbchain = TmdbChain()
self.systemconfig = SystemConfigOper() self.systemconfig = SystemConfigOper()
self.directoryhelper = DirectoryHelper() self.directoryhelper = DirectoryHelper()
self.messagehelper = MessageHelper()
def process(self) -> bool: def process(self) -> bool:
""" """
@ -359,22 +357,10 @@ class TransferChain(ChainBase):
transfers[mkey].file_list_new.extend(transferinfo.file_list_new) transfers[mkey].file_list_new.extend(transferinfo.file_list_new)
transfers[mkey].fail_list.extend(transferinfo.fail_list) transfers[mkey].fail_list.extend(transferinfo.fail_list)
# 硬链接检查
temp_transfer_type = transfer_type
if transfer_type == "link":
if not SystemUtils.is_hardlink(file_path, transferinfo.target_path):
logger.warn(
f"{file_path} 与 {transferinfo.target_path} 不是同一硬链接文件路径，请检查存储空间占用和整理耗时，确认是否为复制")
self.messagehelper.put(
f"{file_path} 与 {transferinfo.target_path} 不是同一硬链接文件路径，疑似硬链接失败，请检查是否为复制",
title="硬链接失败",
role="system")
temp_transfer_type = "copy"
# 新增转移成功历史记录 # 新增转移成功历史记录
self.transferhis.add_success( self.transferhis.add_success(
src_path=file_path, src_path=file_path,
mode=temp_transfer_type, mode=transfer_type,
download_hash=download_hash, download_hash=download_hash,
meta=file_meta, meta=file_meta,
mediainfo=file_mediainfo, mediainfo=file_mediainfo,
@ -384,7 +370,7 @@ class TransferChain(ChainBase):
if transferinfo.need_scrape: if transferinfo.need_scrape:
self.scrape_metadata(path=transferinfo.target_path, self.scrape_metadata(path=transferinfo.target_path,
mediainfo=file_mediainfo, mediainfo=file_mediainfo,
transfer_type=temp_transfer_type, transfer_type=transfer_type,
metainfo=file_meta) metainfo=file_meta)
# 更新进度 # 更新进度
processed_num += 1 processed_num += 1

7
app/utils/system.py
View File

@ -10,6 +10,7 @@ from typing import List, Union, Tuple
import docker import docker
import psutil import psutil
from app import schemas from app import schemas
@ -469,7 +470,9 @@ class SystemUtils:
@staticmethod @staticmethod
def is_hardlink(src: Path, dest: Path) -> bool: def is_hardlink(src: Path, dest: Path) -> bool:
"""判断是否为硬链接""" """
判断是否为硬链接（可能无法支持宿主机挂载smb盘符映射docker的场景）
"""
try: try:
if not src.exists() or not dest.exists(): if not src.exists() or not dest.exists():
return False return False
@ -487,7 +490,7 @@ class SystemUtils:
if not target_file.exists() or not src_file.samefile(target_file): if not target_file.exists() or not src_file.samefile(target_file):
return False return False
return True return True
except (PermissionError, FileNotFoundError, ValueError, OSError) as e: except Exception as e:
print(f"Error occurred: {e}") print(f"Error occurred: {e}")
return False return False