mirror of
https://github.com/jxxghp/MoviePilot.git
synced 2026-09-07 08:26:53 +08:00
- 将计算目录中所有文件总大小移动到 modules.filemanager 模块中。
This commit is contained in:
@@ -223,7 +223,7 @@ class TransferChain(ChainBase):
|
|||||||
# 处理所有待整理目录或文件,默认一个整理路径或文件只有一个媒体信息
|
# 处理所有待整理目录或文件,默认一个整理路径或文件只有一个媒体信息
|
||||||
for trans_item in trans_items:
|
for trans_item in trans_items:
|
||||||
item_path = Path(trans_item.path)
|
item_path = Path(trans_item.path)
|
||||||
# 是否是蓝光路径
|
# 是否蓝光路径
|
||||||
bluray_dir = trans_item.storage == "local" and SystemUtils.is_bluray_dir(item_path)
|
bluray_dir = trans_item.storage == "local" and SystemUtils.is_bluray_dir(item_path)
|
||||||
# 如果是目录且不是⼀蓝光原盘,获取所有文件并整理
|
# 如果是目录且不是⼀蓝光原盘,获取所有文件并整理
|
||||||
if trans_item.type == "dir" and not bluray_dir:
|
if trans_item.type == "dir" and not bluray_dir:
|
||||||
@@ -231,11 +231,9 @@ class TransferChain(ChainBase):
|
|||||||
if (files := self.storagechain.list_files(trans_item, recursion=True)): file_items.extend(files)
|
if (files := self.storagechain.list_files(trans_item, recursion=True)): file_items.extend(files)
|
||||||
# 如果是蓝光目录,计算⼤⼩
|
# 如果是蓝光目录,计算⼤⼩
|
||||||
elif bluray_dir:
|
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)
|
bluray.append(trans_item)
|
||||||
|
# 单个文件
|
||||||
else:
|
else:
|
||||||
# 文件或蓝光目录
|
|
||||||
file_items.append(trans_item)
|
file_items.append(trans_item)
|
||||||
|
|
||||||
if formaterHandler:
|
if formaterHandler:
|
||||||
|
|||||||
@@ -884,12 +884,14 @@ class FileManagerModule(_ModuleBase):
|
|||||||
need_notify=need_notify)
|
need_notify=need_notify)
|
||||||
|
|
||||||
logger.info(f"文件夹 {fileitem.path} 整理成功")
|
logger.info(f"文件夹 {fileitem.path} 整理成功")
|
||||||
|
# 计算目录下所有文件大小
|
||||||
|
total_size = sum(file.stat().st_size for file in Path(fileitem.path).rglob('*') if file.is_file())
|
||||||
# 返回整理后的路径
|
# 返回整理后的路径
|
||||||
return TransferInfo(success=True,
|
return TransferInfo(success=True,
|
||||||
fileitem=fileitem,
|
fileitem=fileitem,
|
||||||
target_item=new_diritem,
|
target_item=new_diritem,
|
||||||
target_diritem=new_diritem,
|
target_diritem=new_diritem,
|
||||||
total_size=fileitem.size,
|
total_size=total_size,
|
||||||
need_scrape=need_scrape,
|
need_scrape=need_scrape,
|
||||||
transfer_type=transfer_type)
|
transfer_type=transfer_type)
|
||||||
else:
|
else:
|
||||||
|
|||||||
Reference in New Issue
Block a user