From 92e30cf97d0eb21f17cdcbfba1c559d0e56de65c Mon Sep 17 00:00:00 2001
From: wanxp <977741432@qq.com>
Date: Thu, 1 Dec 2022 00:18:38 +0800
Subject: [PATCH] fix note bug

---
 .../data/handler/DoubanAbstractLoadHandler.ts  |  2 +-
 .../data/handler/DoubanNoteLoadHandler.ts      | 18 +-----------------
 src/org/wanxp/main.ts                          |  4 ++--
 3 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/src/org/wanxp/douban/data/handler/DoubanAbstractLoadHandler.ts b/src/org/wanxp/douban/data/handler/DoubanAbstractLoadHandler.ts
index c7ca688..9e5282d 100644
--- a/src/org/wanxp/douban/data/handler/DoubanAbstractLoadHandler.ts
+++ b/src/org/wanxp/douban/data/handler/DoubanAbstractLoadHandler.ts
@@ -276,7 +276,7 @@ export default abstract class DoubanAbstractLoadHandler<T extends DoubanSubject>
 			log.warn(i18nHelper.getMessage('100113'));
 			return resultContent;
 		}
-		if (!userState || !userState.collectionDate) {
+		if (!userState) {
 			return resultContent;
 		}
 		return resultContent.replaceAll(DoubanUserParameter.MY_TAGS, this.handleSpecialContent(userState.tags, textMode, context))
diff --git a/src/org/wanxp/douban/data/handler/DoubanNoteLoadHandler.ts b/src/org/wanxp/douban/data/handler/DoubanNoteLoadHandler.ts
index 4969a32..3291f0f 100644
--- a/src/org/wanxp/douban/data/handler/DoubanNoteLoadHandler.ts
+++ b/src/org/wanxp/douban/data/handler/DoubanNoteLoadHandler.ts
@@ -32,23 +32,7 @@ export default class DoubanNoteLoadHandler extends DoubanAbstractLoadHandler<Dou
 	}
 
 	analysisUser(html: CheerioAPI, context: HandleContext): {data:CheerioAPI ,  userState: UserStateSubject} {
-		let rate = html(html('input#n_rating').get(0)).val();
-		let tagsStr = html(html('div#interest_sect_level > div.a_stars > span.color_gray').get(0)).text().trim();
-		let tags = tagsStr.replace('标签:', '').split(' ');
-		let stateWord = html(html('div#interest_sect_level > div.a_stars > span.mr10').get(0)).text().trim();
-		let collectionDateStr = html(html('div#interest_sect_level > div.a_stars > span.mr10 > span.collection_date').get(0)).text().trim();
-		let userState1 = DoubanAbstractLoadHandler.getUserState(stateWord);
-		let component = html(html('div#interest_sect_level > div.a_stars > span.color_gray').get(0)).next().next().text().trim();
-
-
-		const userState: UserStateSubject = {
-			tags: tags,
-			rate: rate?Number(rate):null,
-			state: userState1,
-			collectionDate: collectionDateStr?moment(collectionDateStr, 'YYYY-MM-DD').toDate():null,
-			comment: component
-		}
-		return {data: html, userState: userState};
+		return {data: html, userState: null};
 	}
 
 	parseSubjectFromHtml(html: CheerioAPI, context: HandleContext): DoubanNoteSubject {
diff --git a/src/org/wanxp/main.ts b/src/org/wanxp/main.ts
index 9277ed1..1acbb31 100644
--- a/src/org/wanxp/main.ts
+++ b/src/org/wanxp/main.ts
@@ -35,7 +35,7 @@ export default class DoubanPlugin extends Plugin {
 
 
 	async putToObsidian(context: HandleContext, extract: DoubanSubject) {
-		const {syncStatus} = context.syncStatusHolder;
+		const syncStatus = context.syncStatusHolder && context.syncStatusHolder.syncStatus ? context.syncStatusHolder.syncStatus : null;
 		try {
 
 			if (!extract) {
@@ -88,7 +88,7 @@ export default class DoubanPlugin extends Plugin {
 		}
 		filePath = filePath?filePath:DEFAULT_SETTINGS.dataFilePath;
 		filePath = FileUtil.join(filePath, result.fileName);
-		const {syncStatus} = context.syncStatusHolder;
+		const syncStatus = context.syncStatusHolder && context.syncStatusHolder.syncStatus ? context.syncStatusHolder.syncStatus : null;
 		const {subject} = result;
 		const {content} = result;
 		if (Action.Sync == context.action) {