From 01546baddc4a6576133fde0bd06cee014516a919 Mon Sep 17 00:00:00 2001 From: Attente <19653207+wikrin@users.noreply.github.com> Date: Sat, 26 Oct 2024 00:38:42 +0800 Subject: [PATCH] =?UTF-8?q?fix:=202941=20`delete=5Fmedia=5Ffile`=20?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=80=BC=E7=8E=B0=E4=BF=AE=E6=94=B9=E4=B8=BA?= =?UTF-8?q?:=20-=20`=E7=9B=AE=E5=BD=95=E5=AD=98=E5=9C=A8=E5=85=B6=E4=BB=96?= =?UTF-8?q?=E5=AA=92=E4=BD=93=E6=96=87=E4=BB=B6`=E6=97=B6=E8=BF=94?= =?UTF-8?q?=E5=9B=9E`=E6=96=87=E4=BB=B6=E5=88=A0=E9=99=A4=E7=8A=B6?= =?UTF-8?q?=E6=80=81`=20-=20`=E7=9B=AE=E5=BD=95=E4=B8=8D=E5=AD=98=E5=9C=A8?= =?UTF-8?q?=E5=85=B6=E4=BB=96=E5=AA=92=E4=BD=93=E6=96=87=E4=BB=B6`?= =?UTF-8?q?=E6=97=B6=E8=BF=94=E5=9B=9E`=E7=9B=AE=E5=BD=95=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E7=8A=B6=E6=80=81`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/chain/storage.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/app/chain/storage.py b/app/chain/storage.py index bf60cd55..d7852cbe 100644 --- a/app/chain/storage.py +++ b/app/chain/storage.py @@ -117,14 +117,18 @@ class StorageChain(ChainBase): dir_item = self.get_parent_item(fileitem) if dir_item: files = self.list_files(dir_item, recursion=True) + + # 是否存在其他媒体文件 + media_file_exist = False if files: - # 检查是否还有其他媒体文件 - media_file_exist = False for file in files: if file.extension and f".{file.extension.lower()}" in settings.RMT_MEDIAEXT: media_file_exist = True break - # 删除空目录 - if not media_file_exist: - self.delete_file(dir_item) - return False + # 不存在其他媒体文件,删除空目录 + if not media_file_exist: + # 返回空目录删除状态 + return self.delete_file(dir_item) + + # 存在媒体文件,返回文件删除状态 + return state