fix: 2941

`delete_media_file` 返回值现修改为:
- `目录存在其他媒体文件`时返回`文件删除状态`
- `目录不存在其他媒体文件`时返回`目录删除状态`
This commit is contained in:
Attente
2024-10-26 00:38:42 +08:00
parent 133195cc0a
commit 01546baddc
+9 -5
View File
@@ -117,14 +117,18 @@ class StorageChain(ChainBase):
dir_item = self.get_parent_item(fileitem) dir_item = self.get_parent_item(fileitem)
if dir_item: if dir_item:
files = self.list_files(dir_item, recursion=True) files = self.list_files(dir_item, recursion=True)
if files:
# 检查是否还有其他媒体文件 # 是否存在其他媒体文件
media_file_exist = False media_file_exist = False
if files:
for file in files: for file in files:
if file.extension and f".{file.extension.lower()}" in settings.RMT_MEDIAEXT: if file.extension and f".{file.extension.lower()}" in settings.RMT_MEDIAEXT:
media_file_exist = True media_file_exist = True
break break
# 删除空目录 # 不存在其他媒体文件,删除空目录
if not media_file_exist: if not media_file_exist:
self.delete_file(dir_item) # 返回空目录删除状态
return False return self.delete_file(dir_item)
# 存在媒体文件,返回文件删除状态
return state