From 690066ad3280768239d292a1216ec2709007aaa4 Mon Sep 17 00:00:00 2001
From: jxxghp <jxxghp@gmail.com>
Date: Wed, 13 Dec 2023 06:53:11 +0800
Subject: [PATCH] =?UTF-8?q?-=20=E4=BF=AE=E5=A4=8D=E6=95=B4=E7=90=86?=
 =?UTF-8?q?=E6=97=B6=E4=B8=8D=E8=87=AA=E5=8A=A8=E5=88=9B=E5=BB=BA=E7=9B=AE?=
 =?UTF-8?q?=E6=A0=87=E8=B7=AF=E5=BE=84=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/modules/filetransfer/__init__.py | 16 +++++++---------
 version.py                           |  2 +-
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/app/modules/filetransfer/__init__.py b/app/modules/filetransfer/__init__.py
index 22189eda..f02da72b 100644
--- a/app/modules/filetransfer/__init__.py
+++ b/app/modules/filetransfer/__init__.py
@@ -51,12 +51,11 @@ class FileTransferModule(_ModuleBase):
             target = self.__get_dest_dir(mediainfo=mediainfo, target_dir=target)
         else:
             # 指定了目的目录
-            if not target.exists():
-                # 指定目的目录不存在，创建目录
-                target.mkdir(parents=True, exist_ok=True)
-            elif target.is_file():
-                # 指定目录是个文件，提取文件的有效目录
-                target = target.parent
+            if target.is_file():
+                logger.error(f"转移目标路径是一个文件 {target} 是一个文件")
+                return TransferInfo(success=False,
+                                    path=path,
+                                    message=f"{target} 不是有效目录")
             # 只拼装二级子目录（不要一级目录）
             target = self.__get_dest_dir(mediainfo=mediainfo, target_dir=target, typename_dir=False)
 
@@ -410,9 +409,8 @@ class FileTransferModule(_ModuleBase):
         if transfer_type not in ['rclone_copy', 'rclone_move']:
             # 检查目标路径
             if not target_dir.exists():
-                return TransferInfo(success=False,
-                                    path=in_path,
-                                    message=f"{target_dir} 目标路径不存在")
+                logger.info(f"目标路径不存在，正在创建：{target_dir} ...")
+                target_dir.mkdir(parents=True, exist_ok=True)
 
         # 重命名格式
         rename_format = settings.TV_RENAME_FORMAT \
diff --git a/version.py b/version.py
index a9c122f4..f5905f25 100644
--- a/version.py
+++ b/version.py
@@ -1 +1 @@
-APP_VERSION = 'v1.5.1'
+APP_VERSION = 'v1.5.1-1'