GithubBackup/MoviePilot
1
0
Fork 0
mirror of https://github.com/jxxghp/MoviePilot.git synced 2026-09-05 23:47:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix 手动整理时目录匹配Bug

Browse Source
This commit is contained in:
jxxghp
2024-11-13 21:30:24 +08:00
parent c45d64b554
commit ce4a2314d8
4 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/chain/transfer.py
+15 -3
View File
@@ -120,7 +120,7 @@ class TransferChain(ChainBase):
# 非MoviePilot下载的任务，按文件识别
mediainfo = None
# 执行整理
# 执行整理，匹配源目录
state, errmsg = self.__do_transfer(
fileitem=FileItem(
storage="local",
@@ -131,7 +131,8 @@ class TransferChain(ChainBase):
extension=file_path.suffix.lstrip('.'),
),
mediainfo=mediainfo,
download_hash=torrent.hash
download_hash=torrent.hash,
src_match=True
)
# 设置下载任务状态
@@ -148,7 +149,8 @@ class TransferChain(ChainBase):
target_storage: str = None, target_path: Path = None,
transfer_type: str = None, scrape: bool = None,
season: int = None, epformat: EpisodeFormat = None,
min_filesize: int = 0, download_hash: str = None, force: bool = False) -> Tuple[bool, str]:
min_filesize: int = 0, download_hash: str = None,
force: bool = False, src_match: bool = False) -> Tuple[bool, str]:
"""
执行一个复杂目录的整理操作
:param fileitem: 文件项
@@ -164,6 +166,7 @@ class TransferChain(ChainBase):
:param min_filesize: 最小文件大小(MB)
:param download_hash: 下载记录hash
:param force: 是否强制整理
:param src_match: 是否源目录匹配
返回：成功标识，错误信息
"""
@@ -379,6 +382,15 @@ class TransferChain(ChainBase):
if download_file:
download_hash = download_file.download_hash
# 查询整理目标目录
if not target_directory:
if target_path:
target_directory = self.directoryhelper.get_dir(mediainfo, dest_path=target_path)
elif src_match:
target_directory = self.directoryhelper.get_dir(mediainfo, src_path=file_path)
else:
target_directory = self.directoryhelper.get_dir(mediainfo)
# 执行整理
transferinfo: TransferInfo = self.transfer(fileitem=file_item,
meta=file_meta,