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

Merge pull request #5379 from Pollo3470/v2

Browse Source
This commit is contained in:
jxxghp
2026-01-19 21:17:53 +08:00
committed by GitHub
parent 2b6d7205ec 41381a920c
commit ec665e05e4
7 changed files with 102 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/chain/download.py
View File

@@ -292,6 +292,10 @@ class DownloadChain(ChainBase):
# 登记下载记录
downloadhis = DownloadHistoryOper()
# 获取应用的识别词（如果有）
custom_words_str = None
if hasattr(_meta, 'apply_words') and _meta.apply_words:
custom_words_str = '\n'.join(_meta.apply_words)
downloadhis.add(
path=download_path.as_posix(),
type=_media.type.value,
@@ -315,6 +319,7 @@ class DownloadChain(ChainBase):
date=time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()),
media_category=_media.category,
episode_group=_media.episode_group,
custom_words=custom_words_str,
note={"source": source}
)

33
app/chain/transfer.py
View File

@@ -1080,9 +1080,26 @@ class TransferChain(ChainBase, metaclass=Singleton):
err_msgs.append(f"{file_item.name} 已整理过")
continue
# 提前获取下载历史，以便获取自定义识别词
download_history = None
downloadhis = DownloadHistoryOper()
if bluray_dir:
# 蓝光原盘，按目录名查询
download_history = downloadhis.get_by_path(file_path.as_posix())
else:
# 按文件全路径查询
download_file = downloadhis.get_file_by_fullpath(file_path.as_posix())
if download_file:
download_history = downloadhis.get_by_hash(download_file.download_hash)
# 获取自定义识别词
custom_words_list = None
if download_history and download_history.custom_words:
custom_words_list = download_history.custom_words.split('\n')
if not meta:
# 文件元数据
file_meta = MetaInfoPath(file_path)
# 文件元数据（传入自定义识别词）
file_meta = MetaInfoPath(file_path, custom_words=custom_words_list)
else:
file_meta = meta
@@ -1108,18 +1125,6 @@ class TransferChain(ChainBase, metaclass=Singleton):
if end_ep is not None:
file_meta.end_episode = end_ep
# 根据父路径获取下载历史
download_history = None
downloadhis = DownloadHistoryOper()
if bluray_dir:
# 蓝光原盘，按目录名查询
download_history = downloadhis.get_by_path(file_path.as_posix())
else:
# 按文件全路径查询
download_file = downloadhis.get_file_by_fullpath(file_path.as_posix())
if download_file:
download_history = downloadhis.get_by_hash(download_file.download_hash)
# 获取下载Hash
if download_history and (not downloader or not download_hash):
downloader = download_history.downloader