fix #4581

app/chain/media.py

@@ -367,12 +367,12 @@ class MediaChain(ChainBase):
                                      overwrite=overwrite)
             else:
                 # 检查目的目录下是否已经有nfo刮削文件
-                sub_files = storagechain.list_files(fileitem)
-                if any(f.name.endswith('.nfo') for f in sub_files):
+                has_nfo_file = storagechain.any_files(fileitem, extensions=['.nfo'])
+                if has_nfo_file and file_list:
                     logger.info(f"目录 {fileitem.path} 已有NFO文件，开始增量刮削...")
                     for file_path in file_list:
                         file_item = storagechain.get_file_item(storage=fileitem.storage,
-                                                              path=Path(file_path))
+                                                               path=Path(file_path))
                         if file_item:
                             # 对于电视剧文件，应该保存到与视频文件相同的目录
                             # 而不是电视剧根目录

app/chain/transfer.py

@@ -372,6 +372,8 @@ class TransferChain(ChainBase, metaclass=Singleton):
         self._transfer_interval = 15
         # 事件管理器
         self.jobview = JobManager()
+        # 车移成功的文件清单
+        self._success_target_files: Dict[str, List[str]] = {}
         # 启动整理任务
         self.__init()
 
@@ -441,6 +443,13 @@ class TransferChain(ChainBase, metaclass=Singleton):
         })
 
         with task_lock:
+            # 登记转移成功文件清单
+            target_dir_path = transferinfo.target_diritem.path
+            target_files = transferinfo.file_list_new
+            if self._success_target_files.get(target_dir_path):
+                self._success_target_files[target_dir_path].extend(target_files)
+            else:
+                self._success_target_files[target_dir_path] = target_files
             # 全部整理成功时
             if self.jobview.is_success(task):
                 # 移动模式删除空目录
@@ -461,6 +470,13 @@ class TransferChain(ChainBase, metaclass=Singleton):
                             storagechain.delete_media_file(t.fileitem, delete_self=False)
             # 整理完成且有成功的任务时
             if self.jobview.is_finished(task):
+                # 更新文件数量
+                transferinfo.file_count = self.jobview.count(task.mediainfo, task.meta.begin_season) or 1
+                # 更新文件大小
+                transferinfo.total_size = self.jobview.size(task.mediainfo,
+                                                            task.meta.begin_season) or task.fileitem.size
+                # 更新文件清单
+                transferinfo.file_list_new = self._success_target_files.pop(transferinfo.target_diritem.path, [])
                 # 发送通知，实时手动整理时不发
                 if transferinfo.need_notify and (task.background or not task.manual):
                     se_str = None
@@ -470,11 +486,6 @@ class TransferChain(ChainBase, metaclass=Singleton):
                             se_str = f"{task.meta.season} {StringUtils.format_ep(season_episodes)}"
                         else:
                             se_str = f"{task.meta.season}"
-                    # 更新文件数量
-                    transferinfo.file_count = self.jobview.count(task.mediainfo, task.meta.begin_season) or 1
-                    # 更新文件大小
-                    transferinfo.total_size = self.jobview.size(task.mediainfo,
-                                                                task.meta.begin_season) or task.fileitem.size
                     self.send_transfer_message(meta=task.meta,
                                                mediainfo=task.mediainfo,
                                                transferinfo=transferinfo,