From bf9a14989848f5124bf0308914c444d47e676d5e Mon Sep 17 00:00:00 2001 From: Cursor Agent Date: Tue, 8 Jul 2025 09:31:35 +0000 Subject: [PATCH 1/2] Fix TV show metadata scraping to use correct parent directory Co-authored-by: jxxghp --- app/chain/media.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/app/chain/media.py b/app/chain/media.py index 3ee4103b..aafe13d1 100644 --- a/app/chain/media.py +++ b/app/chain/media.py @@ -371,12 +371,16 @@ class MediaChain(ChainBase): if any(f.name.endswith('.nfo') for f in sub_files): logger.info(f"目录 {fileitem.path} 已有NFO文件，开始增量刮削...") for file_path in file_list: - self.scrape_metadata(fileitem=storagechain.get_file_item(storage=fileitem.storage, - path=Path(file_path)), - mediainfo=mediainfo, - init_folder=False, - parent=fileitem, - overwrite=overwrite) + file_item = storagechain.get_file_item(storage=fileitem.storage, + path=Path(file_path)) + if file_item: + # 对于电视剧文件，应该保存到与视频文件相同的目录 + # 而不是电视剧根目录 + self.scrape_metadata(fileitem=file_item, + mediainfo=mediainfo, + init_folder=False, + parent=None, # 让函数内部自动获取正确的父目录 + overwrite=overwrite) else: # 执行全量刮削 logger.info(f"开始全量刮削目录 {fileitem.path} ...") From 8c516c56914935bab19ce0a4bb37a248b87029f4 Mon Sep 17 00:00:00 2001 From: Cursor Agent Date: Tue, 8 Jul 2025 09:51:43 +0000 Subject: [PATCH 2/2] Fix: Ensure parent item exists before saving NFO file Co-authored-by: jxxghp --- app/chain/media.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/chain/media.py b/app/chain/media.py index aafe13d1..d4b71096 100644 --- a/app/chain/media.py +++ b/app/chain/media.py @@ -492,6 +492,8 @@ class MediaChain(ChainBase): movie_nfo = self.metadata_nfo(meta=meta, mediainfo=mediainfo) if movie_nfo: # 保存或上传nfo文件到上级目录 + if not parent: + parent = storagechain.get_parent_item(fileitem) __save_file(_fileitem=parent, _path=nfo_path, _content=movie_nfo) else: logger.warn(f"{filepath.name} nfo文件生成失败！")