From ab78b102871a7edb9d7a319ddb0e3bae9c5f1b5e Mon Sep 17 00:00:00 2001 From: Attente <19653207+wikrin@users.noreply.github.com> Date: Sun, 27 Oct 2024 23:28:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E5=88=A4=E6=96=AD=E7=A7=BB=E5=87=BA,?= =?UTF-8?q?=20=E5=87=8F=E5=B0=91`is=5Fbluray=5Fdir`=E8=B0=83=E7=94=A8?= =?UTF-8?q?=E6=AC=A1=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/chain/transfer.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/app/chain/transfer.py b/app/chain/transfer.py index c50776fd..aa8a7f9c 100644 --- a/app/chain/transfer.py +++ b/app/chain/transfer.py @@ -223,14 +223,16 @@ class TransferChain(ChainBase): # 处理所有待整理目录或文件，默认一个整理路径或文件只有一个媒体信息 for trans_item in trans_items: item_path = Path(trans_item.path) + # 是否是蓝光路径 + bluray_dir = trans_item.storage == "local" and SystemUtils.is_bluray_dir(item_path) # 如果是目录且不是⼀蓝光原盘，获取所有文件并整理 - if (trans_item.type == "dir" - and not (trans_item.storage == "local" and SystemUtils.is_bluray_dir(item_path))): + if trans_item.type == "dir" and not bluray_dir: # 遍历获取下载目录所有文件（递归） - files = self.storagechain.list_files(trans_item, recursion=True) - if files: - file_items.extend(files) - elif (trans_item.storage == "local" and SystemUtils.is_bluray_dir(item_path)): + if (files := self.storagechain.list_files(trans_item, recursion=True)): file_items.extend(files) + # files = self.storagechain.list_files(trans_item, recursion=True) + # if files: + # file_items.extend(files) + elif bluray_dir: # 计算目录下文件总大小 trans_item.size = sum(file.stat().st_size for file in item_path.rglob('*') if file.is_file()) bluray.append(trans_item)