Merge pull request #2942 from wikrin/v2

This commit is contained in:
jxxghp
2024-10-26 08:09:33 +08:00
committed by GitHub
+10 -6
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)
# 是否存在其他媒体文件
media_file_exist = False
if files: if files:
# 检查是否还有其他媒体文件
media_file_exist = False
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