From 0ee21b38decc8849523be5eb209a6275284f7469 Mon Sep 17 00:00:00 2001
From: Attente <19653207+wikrin@users.noreply.github.com>
Date: Fri, 25 Oct 2024 01:27:39 +0800
Subject: [PATCH] =?UTF-8?q?=20fix:=20-=20=E4=BF=AE=E5=A4=8D=E5=9B=A0?=
 =?UTF-8?q?=E9=A6=96=E4=B8=AA=E5=AD=90=E7=9B=AE=E5=BD=95=E4=B8=AD=E6=97=A0?=
 =?UTF-8?q?=E7=9B=AE=E6=A0=87=E6=96=87=E4=BB=B6=E8=80=8C=E4=B8=8D=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=E6=95=B4=E4=B8=AA=E6=96=87=E4=BB=B6=E5=A4=B9=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=20-=20=E6=B7=BB=E5=8A=A0=E5=90=8C=E6=97=B6?=
 =?UTF-8?q?=E6=95=B4=E7=90=86=E9=9F=B3=E8=BD=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/chain/transfer.py | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/app/chain/transfer.py b/app/chain/transfer.py
index 0b5472fa..d294015c 100644
--- a/app/chain/transfer.py
+++ b/app/chain/transfer.py
@@ -184,6 +184,17 @@ class TransferChain(ChainBase):
         # 开始进度
         self.progress.start(ProgressKey.FileTransfer)
 
+        # 汇总季集清单
+        season_episodes: Dict[Tuple, List[int]] = {}
+        # 汇总元数据
+        metas: Dict[Tuple, MetaBase] = {}
+        # 汇总媒体信息
+        medias: Dict[Tuple, MediaInfo] = {}
+        # 汇总整理信息
+        transfers: Dict[Tuple, TransferInfo] = {}
+
+        # 待整理文件列表
+        file_items = []
         # 汇总错误信息
         err_msgs: List[str] = []
         # 已处理数量
@@ -209,14 +220,6 @@ class TransferChain(ChainBase):
 
         # 处理所有待整理目录或文件，默认一个整理路径或文件只有一个媒体信息
         for trans_item in trans_items:
-            # 汇总季集清单
-            season_episodes: Dict[Tuple, List[int]] = {}
-            # 汇总元数据
-            metas: Dict[Tuple, MetaBase] = {}
-            # 汇总媒体信息
-            medias: Dict[Tuple, MediaInfo] = {}
-            # 汇总整理信息
-            transfers: Dict[Tuple, TransferInfo] = {}
 
             item_path = Path(trans_item.path)
             # 如果是目录且不是⼀蓝光原盘，获取所有文件并整理
@@ -228,7 +231,7 @@ class TransferChain(ChainBase):
                     continue
             else:
                 # 文件或蓝光目录
-                file_items = [trans_item]
+                file_items.append(trans_item)
 
             if formaterHandler:
                 # 有集自定义格式，过滤文件
@@ -236,13 +239,15 @@ class TransferChain(ChainBase):
 
             # 过滤后缀和大小
             file_items = [f for f in file_items
-                          if f.extension and (f".{f.extension.lower()}" in self.all_exts
+                          if f.extension and (f".{f.extension.lower()}" in self.all_exts + settings.RMT_AUDIO_TRACK_EXT
                                               and (not min_filesize or f.size > min_filesize * 1024 * 1024))]
 
             if not file_items:
                 logger.warn(f"{fileitem.path} 没有找到可整理的媒体文件")
                 return False, f"{fileitem.name} 没有找到可整理的媒体文件"
 
+            # 更新总文件数
+            total_num = len(file_items)
             logger.info(f"正在整理 {len(file_items)} 个文件...")
 
             # 整理所有文件