From dd1648c20aa3d4a76510229c2b9bea14b8826f39 Mon Sep 17 00:00:00 2001
From: Wanxp <977741432@qq.com>
Date: Thu, 5 Jun 2025 14:00:28 +0800
Subject: [PATCH] =?UTF-8?q?fix=20#151=20=E7=AC=94=E8=AE=B0=E5=AD=98?=
 =?UTF-8?q?=E6=94=BE=E4=BD=8D=E7=BD=AE=EF=BC=8C=E6=97=A0=E6=B3=95=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=E8=87=AA=E5=AE=9A=E4=B9=89=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data/handler/DoubanAbstractLoadHandler.ts    | 16 ++++++++++++++--
 src/org/wanxp/main.ts                            |  7 +------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/org/wanxp/douban/data/handler/DoubanAbstractLoadHandler.ts b/src/org/wanxp/douban/data/handler/DoubanAbstractLoadHandler.ts
index 9c0f7b5..d200211 100644
--- a/src/org/wanxp/douban/data/handler/DoubanAbstractLoadHandler.ts
+++ b/src/org/wanxp/douban/data/handler/DoubanAbstractLoadHandler.ts
@@ -71,12 +71,15 @@ export default abstract class DoubanAbstractLoadHandler<T extends DoubanSubject>
 		} else {
 			result = this.parsePartText(template, extract, context);
 		}
+		let filePath = '';
+		if (SearchHandleMode.FOR_CREATE == context.mode) {
+			filePath = this.parsePartText(this.getFilePath(context), extract, context);
+		}
 		let fileName = '';
 		if (SearchHandleMode.FOR_CREATE == context.mode) {
 			fileName = this.parsePartText(this.getFileName(context), extract, context);
 		}
-
-		return {content: result, fileName: fileName, subject:extract};
+		return {content: result,filePath: filePath, fileName: fileName, subject:extract};
 	}
 
 	private getFileName(context: HandleContext): string {
@@ -88,6 +91,15 @@ export default abstract class DoubanAbstractLoadHandler<T extends DoubanSubject>
 		return dataFileNamePath ? dataFileNamePath : DEFAULT_SETTINGS.dataFileNamePath;
 	}
 
+	private getFilePath(context: HandleContext): string {
+		const {syncConfig} = context;
+		if (syncConfig) {
+			return syncConfig.dataFilePath;
+		}
+		const {dataFilePath} = context.settings;
+		return dataFilePath ? dataFilePath : DEFAULT_SETTINGS.dataFilePath;
+	}
+
 
 
 
diff --git a/src/org/wanxp/main.ts b/src/org/wanxp/main.ts
index 19f3158..5690ea1 100644
--- a/src/org/wanxp/main.ts
+++ b/src/org/wanxp/main.ts
@@ -105,12 +105,7 @@ export default class DoubanPlugin extends Plugin {
 	}
 
 	async createFile(context: HandleContext, result: HandleResult) {
-		let filePath = this.settings.dataFilePath;
-		const {syncConfig} = context;
-		if (syncConfig) {
-			filePath = syncConfig.dataFilePath;
-		}
-		filePath = filePath?filePath:DEFAULT_SETTINGS.dataFilePath;
+		let filePath = result.filePath?result.filePath:DEFAULT_SETTINGS.dataFilePath;
 		filePath = FileUtil.join(filePath, result.fileName);
 		const syncStatus = context.syncStatusHolder && context.syncStatusHolder.syncStatus ? context.syncStatusHolder.syncStatus : null;
 		const {subject} = result;