From 1924a2017ee74c8dbd0778995fc91f749fd1fcf5 Mon Sep 17 00:00:00 2001
From: thsrite <thsrite@gmail.com>
Date: Tue, 10 Oct 2023 11:15:26 +0800
Subject: [PATCH 1/2] fix #773

---
 app/plugins/dirmonitor/__init__.py | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/plugins/dirmonitor/__init__.py b/app/plugins/dirmonitor/__init__.py
index fff66fbe..d44dc8eb 100644
--- a/app/plugins/dirmonitor/__init__.py
+++ b/app/plugins/dirmonitor/__init__.py
@@ -126,6 +126,13 @@ class DirMonitor(_PluginBase):
                 if not mon_path:
                     continue
 
+                # 自定义转移方式
+                if mon_path.count("#") == 1:
+                    self._transferconf[mon_path] = mon_path.split("#")[1]
+                    mon_path = mon_path.split("#")[0]
+                else:
+                    self._transferconf[mon_path] = self._transfer_type
+
                 # 存储目的目录
                 if SystemUtils.is_windows():
                     if mon_path.count(":") > 1:
@@ -136,12 +143,6 @@ class DirMonitor(_PluginBase):
                 else:
                     paths = mon_path.split(":")
 
-                # 自定义转移方式
-                if mon_path.count("#") == 1:
-                    self._transferconf[mon_path] = mon_path.split("#")[1]
-                else:
-                    self._transferconf[mon_path] = self._transfer_type
-
                 target_path = None
                 if len(paths) > 1:
                     mon_path = paths[0]
@@ -615,6 +616,7 @@ class DirMonitor(_PluginBase):
                                             'rows': 5,
                                             'placeholder': '每一行一个目录，支持三种配置方式：\n'
                                                            '监控目录\n'
+                                                           '监控目录#转移方式（move|copy|link|softlink）\n'
                                                            '监控目录:转移目的目录（需同时在媒体库目录中配置该目的目录）\n'
                                                            '监控目录:转移目的目录#转移方式（move|copy|link|softlink）'
                                         }

From 39a646ed922d605be576a04a4d800b0010294794 Mon Sep 17 00:00:00 2001
From: jxxghp <jxxghp@gmail.com>
Date: Tue, 10 Oct 2023 12:50:11 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20README.md?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 155eb14d..b552fa4c 100644
--- a/README.md
+++ b/README.md
@@ -173,7 +173,7 @@ MoviePilot需要配套下载器和媒体服务器配合使用。
 
 ### 2. **用户认证**
 
-`MoviePilot`需要认证后才能使用，配置`AUTH_SITE`后，需要根据下表配置对应站点的认证参数（**仅能通过docker环境变量配置**）
+`MoviePilot`需要认证后才能使用，配置`AUTH_SITE`后，需要根据下表配置对应站点的认证参数（**仅能通过环境变量配置**）
 
 - **AUTH_SITE $\color{red}{*}$ ：** 认证站点，支持`iyuu`/`hhclub`/`audiences`/`hddolby`/`zmpt`/`freefarm`/`hdfans`/`wintersakura`/`leaves`/`1ptba`/`icc2022`/`ptlsp`/`xingtan`