From 9ec1e73e5a582aec6ab13f86d2b34f1b115adc78 Mon Sep 17 00:00:00 2001
From: thsrite <thsrite@gmail.com>
Date: Sun, 30 Jun 2024 20:35:11 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=E8=A6=86=E7=9B=96?=
 =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                          |  2 +-
 package.json                       |  3 ++-
 plugins/cloudassistant/__init__.py | 13 ++++++-------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index e261643..fd86695 100644
--- a/README.md
+++ b/README.md
@@ -42,7 +42,7 @@ MoviePilot三方插件市场：https://github.com/thsrite/MoviePilot-Plugins/
 - 目录监控（统一入库消息增强版） v1.0
 - Sql执行器 v1.2
 - 命令执行器 v1.2
-- 云盘助手(docs%2FCloudAssistant.md) v2.0.5
+- 云盘助手(docs%2FCloudAssistant.md) v2.0.6
 - CloudDrive2助手 v1.2
 - 软连接重定向 v1.0
 - 云盘同步删除 v1.3
diff --git a/package.json b/package.json
index 2313b57..788c815 100644
--- a/package.json
+++ b/package.json
@@ -524,11 +524,12 @@
         "name": "云盘助手",
         "description": "本地文件定时转移到云盘，软连接/strm回本地，定时清理无效软连接。",
         "labels": "云盘",
-        "version": "2.0.5",
+        "version": "2.0.6",
         "icon": "https://raw.githubusercontent.com/thsrite/MoviePilot-Plugins/main/icons/cloudassistant.png",
         "author": "thsrite",
         "level": 3,
         "history": {
+          "v2.0.6": "修复覆盖模式操作",
           "v2.0.5": "修复媒体文件转移完但刮削文件未转移删除目录的问题",
           "v2.0.4": "修复挂载目录log",
           "v2.0.3": "修复默认值bug",
diff --git a/plugins/cloudassistant/__init__.py b/plugins/cloudassistant/__init__.py
index c1c1336..8130dd1 100644
--- a/plugins/cloudassistant/__init__.py
+++ b/plugins/cloudassistant/__init__.py
@@ -65,7 +65,7 @@ class CloudAssistant(_PluginBase):
     # 插件图标
     plugin_icon = "https://raw.githubusercontent.com/thsrite/MoviePilot-Plugins/main/icons/cloudassistant.png"
     # 插件版本
-    plugin_version = "2.0.5"
+    plugin_version = "2.0.6"
     # 插件作者
     plugin_author = "thsrite"
     # 作者主页
@@ -440,7 +440,10 @@ class CloudAssistant(_PluginBase):
                         if Path(mount_file).exists():
                             logger.info(f"云盘文件 {mount_file} 已存在且未开启覆盖，跳过上传")
                             upload = False
-
+                    else:
+                        if Path(mount_file).exists():
+                            logger.info(f"云盘文件 {mount_file} 已存在且开启覆盖，删除原云盘文件")
+                            Path(mount_file).unlink()
                     if upload:
                         # 媒体文件转移
                         if Path(file_path).suffix.lower() in [ext.strip() for ext in
@@ -593,6 +596,7 @@ class CloudAssistant(_PluginBase):
                 continue
             if transferhis.src.startswith(source_dir):
                 source_path = source_dir
+                logger.info(f"获取到源文件 {transferhis.src} 根目录 {source_path}")
                 break
 
         # 删除源文件空目录
@@ -751,11 +755,6 @@ class CloudAssistant(_PluginBase):
                 os.makedirs(target_file)
                 return 1
         else:
-            # 文件
-            if Path(target_file).exists():
-                logger.info(f"目标文件 {target_file} 已存在")
-                return 1
-
             if not Path(target_file).parent.exists():
                 logger.info(f"创建目标文件夹 {Path(target_file).parent}")
                 os.makedirs(Path(target_file).parent)