From 8e4bce2f958be38983ca2be546617ddc094347ff Mon Sep 17 00:00:00 2001
From: jxxghp <jxxghp@gmail.com>
Date: Fri, 15 Nov 2024 08:03:23 +0800
Subject: [PATCH] fix #3079

---
 app/chain/storage.py |  2 ++
 app/monitor.py       | 15 +++++++--------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/chain/storage.py b/app/chain/storage.py
index a38b234f..71ef09a8 100644
--- a/app/chain/storage.py
+++ b/app/chain/storage.py
@@ -115,6 +115,8 @@ class StorageChain(ChainBase):
         if not state:
             logger.warn(f"【{fileitem.storage}】{fileitem.path} 删除失败")
             return False
+        if fileitem.type == "dir":
+            return True
         # 上级目录
         if mtype and mtype == MediaType.TV:
             dir_path = Path(fileitem.path).parent.parent
diff --git a/app/monitor.py b/app/monitor.py
index 8920c405..33abdbe7 100644
--- a/app/monitor.py
+++ b/app/monitor.py
@@ -478,14 +478,13 @@ class Monitor(metaclass=Singleton):
 
                 # 移动模式删除空目录
                 if transferinfo.transfer_type in ["move"]:
-                    logger.info(f"正在删除： {file_item.storage} {file_item.path}")
-                    if self.storagechain.delete_file(file_item):
-                        # 删除空的父目录
-                        dir_item = self.storagechain.get_parent_item(file_item)
-                        if dir_item:
-                            if not self.storagechain.any_files(dir_item, extensions=settings.RMT_MEDIAEXT):
-                                logger.warn(f"正在删除空目录： {dir_item.storage} {dir_item.path}")
-                                return self.storagechain.delete_file(dir_item)
+                    if file_item.type == "dir":
+                        folder_item = file_item
+                    else:
+                        folder_item = self.storagechain.get_parent_item(file_item)
+                    if folder_item and not self.storagechain.any_files(folder_item, extensions=settings.RMT_MEDIAEXT):
+                        logger.warn(f"删除残留空文件夹：【{folder_item.storage}】{folder_item.path}")
+                        self.storagechain.delete_file(folder_item)
 
             except Exception as e:
                 logger.error("目录监控发生错误：%s - %s" % (str(e), traceback.format_exc()))