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

fix(transfer): 修复订阅自定义识别词在整理时失效 (#6018)

Browse Source
This commit is contained in:
Pollo3470
2026-06-29 15:49:02 +08:00
committed by GitHub
parent b646cbb4f6
commit 302d8bbf5c
6 changed files with 210 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
app/chain/download.py
View File

@@ -478,7 +478,8 @@ class DownloadChain(ChainBase):
userid: Union[str, int] = None,
username: Optional[str] = None,
label: Optional[str] = None,
return_detail: bool = False) -> Union[Optional[str], Tuple[Optional[str], Optional[str]]]:
return_detail: bool = False,
custom_words: Optional[str] = None) -> Union[Optional[str], Tuple[Optional[str], Optional[str]]]:
"""
下载及发送通知
:param context: 资源上下文
@@ -493,6 +494,7 @@ class DownloadChain(ChainBase):
:param username: 调用下载的用户名/插件名
:param label: 自定义标签
:param return_detail: 是否返回详细结果；False 时返回下载任务 hash 或 None，True 时返回 (hash, error_msg)
:param custom_words: 下载来源（如订阅）的完整自定义识别词文本，随下载记录存档，供整理时原样复现识别
:return: return_detail=False 时返回下载任务 hash 或 None；return_detail=True 时返回 (hash, error_msg)
"""
_torrent = context.torrent_info
@@ -649,7 +651,8 @@ class DownloadChain(ChainBase):
date=time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()),
media_category=_media.category,
episode_group=_media.episode_group,
note={"source": source}
note={"source": source},
custom_words=custom_words
)
# 登记下载文件
@@ -738,7 +741,8 @@ class DownloadChain(ChainBase):
source: Optional[str] = None,
userid: Optional[str] = None,
username: Optional[str] = None,
downloader: Optional[str] = None
downloader: Optional[str] = None,
custom_words: Optional[str] = None
) -> Tuple[List[Context], Dict[Union[int, str], Dict[int, NotExistMediaInfo]]]:
"""
根据缺失数据，自动种子列表中组合择优下载
@@ -750,6 +754,7 @@ class DownloadChain(ChainBase):
:param userid: 用户ID
:param username: 调用下载的用户名/插件名
:param downloader: 下载器
:param custom_words: 下载来源（如订阅）的完整自定义识别词文本，随下载记录存档，供整理时原样复现识别
:return: 已经下载的资源列表、剩余未下载到的剧集 no_exists[tmdb_id/douban_id] = {season: NotExistMediaInfo}
"""
# 已下载的项目
@@ -890,7 +895,7 @@ class DownloadChain(ChainBase):
logger.info(f"开始下载电影 {context.torrent_info.title} ...")
if self.download_single(context, save_path=save_path, channel=channel,
source=source, userid=userid, username=username,
downloader=downloader):
downloader=downloader, custom_words=custom_words):
# 下载成功
logger.info(f"{context.torrent_info.title} 添加下载成功")
downloaded_list.append(context)
@@ -993,7 +998,8 @@ class DownloadChain(ChainBase):
source=source,
userid=userid,
username=username,
downloader=downloader
downloader=downloader,
custom_words=custom_words
)
else:
# 下载
@@ -1001,7 +1007,8 @@ class DownloadChain(ChainBase):
download_id = self.download_single(context, save_path=save_path,
channel=channel, source=source,
userid=userid, username=username,
downloader=downloader)
downloader=downloader,
custom_words=custom_words)
if download_id:
# 下载成功
@@ -1085,7 +1092,8 @@ class DownloadChain(ChainBase):
download_id = self.download_single(context, save_path=save_path,
channel=channel, source=source,
userid=userid, username=username,
downloader=downloader)
downloader=downloader,
custom_words=custom_words)
if download_id:
# 下载成功
if __requires_complete_coverage(tv):
@@ -1182,7 +1190,8 @@ class DownloadChain(ChainBase):
source=source,
userid=userid,
username=username,
downloader=downloader
downloader=downloader,
custom_words=custom_words
)
if not download_id:
continue

2
app/chain/subscribe.py
View File

@@ -586,6 +586,7 @@ class SubscribeChain(ChainBase):
save_path=save_path,
downloader=downloader,
source=source,
custom_words=subscribe.custom_words,
)
if downloads:
return downloads, lefts
@@ -598,6 +599,7 @@ class SubscribeChain(ChainBase):
save_path=save_path,
downloader=downloader,
source=source,
custom_words=subscribe.custom_words,
)
@staticmethod

50
app/chain/transfer.py
View File

@@ -2439,6 +2439,32 @@ class TransferChain(ChainBase, ConfigReloadMixin, metaclass=Singleton):
self.__normalize_dir_path(Path(current_item.path).parent),
)
@staticmethod
def _get_subscribe_custom_words(
history_record: Optional[DownloadHistory],
) -> Optional[List[str]]:
"""
获取整理用自定义识别词：优先使用下载时保存的快照，无快照（历史旧记录）时再按来源实时反查订阅。
快照优先可避免整理阶段因订阅季号漂移、来源解析失败或订阅完成被删导致识别词丢失，从而原样入库到偏移前的季集。
"""
if not history_record:
return None
# 下载时保存的完整订阅识别词快照优先
if history_record.custom_words:
return history_record.custom_words.split("\n")
# 兜底：历史旧记录无快照时，按下载来源实时反查订阅
if not isinstance(history_record.note, dict):
return None
subscribe = SubscribeChain().get_subscribe_by_source(
history_record.note.get("source")
)
return (
subscribe.custom_words.split("\n")
if subscribe and subscribe.custom_words
else None
)
def do_transfer(
self,
fileitem: FileItem,
@@ -2515,24 +2541,6 @@ class TransferChain(ChainBase, ConfigReloadMixin, metaclass=Singleton):
# 汇总错误信息
err_msgs: List[str] = []
def _get_subscribe_custom_words(
history_record: Optional[DownloadHistory],
) -> Optional[List[str]]:
"""
根据下载记录获取订阅自定义识别词。
"""
if not history_record or not isinstance(history_record.note, dict):
return None
# 使用source动态获取订阅
subscribe = SubscribeChain().get_subscribe_by_source(
history_record.note.get("source")
)
return (
subscribe.custom_words.split("\n")
if subscribe and subscribe.custom_words
else None
)
def _build_file_meta(
source_path: Path,
custom_word_list: Optional[List[str]] = None,
@@ -2656,7 +2664,7 @@ class TransferChain(ChainBase, ConfigReloadMixin, metaclass=Singleton):
)
return _build_file_meta(
main_path,
custom_word_list=_get_subscribe_custom_words(main_download_history),
custom_word_list=self._get_subscribe_custom_words(main_download_history),
)
def _append_item(
@@ -2814,7 +2822,7 @@ class TransferChain(ChainBase, ConfigReloadMixin, metaclass=Singleton):
bluray_dir=main_bluray_dir,
download_hash=download_hash,
)
subscribe_custom_words = _get_subscribe_custom_words(
subscribe_custom_words = self._get_subscribe_custom_words(
main_download_history
)
main_meta = _build_file_meta(
@@ -2937,7 +2945,7 @@ class TransferChain(ChainBase, ConfigReloadMixin, metaclass=Singleton):
else:
file_meta = _build_file_meta(
file_path,
custom_word_list=_get_subscribe_custom_words(download_history),
custom_word_list=self._get_subscribe_custom_words(download_history),
)
else:
file_meta = _build_file_meta(file_path)