manifest.json

@@ -1,7 +1,7 @@
 {
 	"id": "obsidian-douban-plugin",
 	"name": "Douban",
-	"version": "2.3.2",
+	"version": "2.3.1",
 	"minAppVersion": "0.12.0",
 	"description": "This is a plugin that can import movies/books/musics/notes/games info data from Douban for Obsidian .",
 	"author": "Wanxp",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "obsidian-douban-plugin",
-  "version": "2.3.2",
+  "version": "2.3.1",
   "description": "This is a plugin for Obsidian (https://obsidian.md) that can import data from Douban (https://www.douban.com/).",
   "main": "main.js",
   "scripts": {

src/org/wanxp/douban/ai/handler/DoubanTheaterAiLoadHandler.ts

@@ -33,24 +33,24 @@ export default class DoubanTheaterAiLoadHandler extends DoubanAbstractLoadHandle
 			"director",
 			DataValueType.array,
 			extract.director,
-			(extract.director || []).map(SchemaOrg.getPersonName).filter(c => c)
+			extract.director.map(SchemaOrg.getPersonName).filter(c => c)
 		));
 
 		variableMap.set("actor", new DataField(
 			"actor",
 			DataValueType.array,
 			extract.actor,
-			(extract.actor || []).map(SchemaOrg.getPersonName).filter(c => c)
+			extract.actor.map(SchemaOrg.getPersonName).filter(c => c)
 		));
 
 		variableMap.set("author", new DataField(
 			"author",
 			DataValueType.array,
 			extract.author,
-			(extract.author || []).map(SchemaOrg.getPersonName).map(name => super.getPersonName(name, context)).filter(c => c)
+			extract.author.map(SchemaOrg.getPersonName).map(name => super.getPersonName(name, context)).filter(c => c)
 		));
 		variableMap.set("aliases", new DataField("aliases", DataValueType.array, extract.aliases,
-			(extract.aliases || []).map(a=>a
+			extract.aliases.map(a=>a
 					.trim()
 				// 		.replace(TITLE_ALIASES_SPECIAL_CHAR_REG_G, '_')
 				// 		//replase multiple _ to single _

src/org/wanxp/douban/component/DoubanSyncModal.ts

@@ -169,6 +169,9 @@ ${syncStatus.getHandle() == 0? '...' : i18nHelper.getMessage('110042') + ':' + T
 		const syncButton = new ButtonComponent(controls)
 			.setButtonText(i18nHelper.getMessage('110007'))
 			.onClick(async () => {
+				if (!this.plugin.userComponent.isLogin()) {
+					await this.plugin.userComponent.login();
+				}
 				if(!await this.plugin.checkLogin(this.context)) {
 					return;
 				}

src/org/wanxp/douban/data/handler/DoubanAbstractLoadHandler.ts

@@ -142,7 +142,7 @@ export default abstract class DoubanAbstractLoadHandler<T extends DoubanSubject>
 				}else {
 					context.syncStatusHolder?context.syncStatusHolder.syncStatus.handled(1):null;
 				}
-				return undefined;
+				return e;
 			});
 
 
@@ -543,20 +543,15 @@ export default abstract class DoubanAbstractLoadHandler<T extends DoubanSubject>
 		}
 		fileName = this.parsePartPath(fileName, extract, context, variableMap)
 		fileName = fileName + fileNameSuffix;
-		const imageReferer = (extract.id ? this.getSubjectUrl(extract.id) : '') || extract.url;
-		const referHeaders = HttpUtil.buildImageRequestHeaders(
-			context.plugin.settingsManager.getHeaders() as Record<string, any>,
-			imageReferer
-		);
+		// const referHeaders = {'referer': image};
+		const referHeaders =  context.settings.loginHeadersContent ? JSON.parse(context.settings.loginHeadersContent) : {};
 		if ((syncConfig ? syncConfig.cacheHighQuantityImage : context.settings.cacheHighQuantityImage) && context.userComponent.isLogin()) {
 			try {
-				const highImageFilename = this.getImageFilename(image);
-				const highImage = this.getHighQuantityImageUrl(highImageFilename);
-				const highImageHeaders = HttpUtil.buildImageRequestHeaders(
-					context.plugin.settingsManager.getHeaders() as Record<string, any>,
-					imageReferer
-				);
-				const resultValue = await this.handleImage(highImage, folder, fileName, context, false, highImageHeaders);
+				const fileNameSpilt = fileName.split('.');
+				const highFilename = fileNameSpilt.first() + '.jpg';
+
+				const highImage = this.getHighQuantityImageUrl(highFilename);
+				const resultValue = await this.handleImage(highImage, folder, highFilename, context, false, referHeaders);
 				if (resultValue && resultValue.success) {
 					extract.image = resultValue.filepath;
 					this.initImageVariableMap(extract, context, variableMap);
@@ -574,14 +569,6 @@ export default abstract class DoubanAbstractLoadHandler<T extends DoubanSubject>
 		}
 	}
 
-	private getImageFilename(image: string): string {
-		if (!image) {
-			return '';
-		}
-		const imageUrl = image.split('?').first() || image;
-		return imageUrl.substring(imageUrl.lastIndexOf('/') + 1);
-	}
-
 	private initImageVariableMap(extract: T, context: HandleContext, variableMap : Map<string, DataField>) {
 		variableMap.set(DoubanParameterName.IMAGE_URL, new DataField(
 			DoubanParameterName.IMAGE_URL,
@@ -621,20 +608,12 @@ export default abstract class DoubanAbstractLoadHandler<T extends DoubanSubject>
 
 	handlePersonNameByMeta(html: CheerioAPI, movie: DoubanSubject, context: HandleContext,
 								   metaProperty:string, objectProperty:string) {
-		if (!movie) {
-			return;
-		}
 		const metaProperties: string[] = html(`head > meta[property='${metaProperty}']`).get()
 			.map((e) => {
 				return html(e).attr('content');
 			});
 		// @ts-ignore
-		const currentArray = movie[objectProperty];
-		if (!Array.isArray(currentArray)) {
-			return;
-		}
-		// @ts-ignore
-		currentArray
+		movie[objectProperty]
 			// @ts-ignore
 			.filter((p:Person) => p.name)
 			// @ts-ignore

src/org/wanxp/douban/data/handler/DoubanBookLoadHandler.ts

@@ -30,9 +30,9 @@ export default class DoubanBookLoadHandler extends DoubanAbstractLoadHandler<Dou
 
 	parseVariable(beforeContent: string, variableMap:Map<string, DataField>, extract: DoubanBookSubject, context: HandleContext): void {
 		variableMap.set(DoubanBookParameter.author, new DataField(DoubanBookParameter.author,
-			DataValueType.array, extract.author, (extract.author || []).map(this.handleSpecialAuthorName)));
+			DataValueType.array, extract.author, extract.author.map(this.handleSpecialAuthorName)));
 		variableMap.set(DoubanBookParameter.translator, new DataField(DoubanBookParameter.translator,
-			DataValueType.array, extract.translator, (extract.translator || []).map(this.handleSpecialAuthorName)));
+			DataValueType.array, extract.translator, extract.translator.map(this.handleSpecialAuthorName)));
 	}
 
 	support(extract: DoubanSubject): boolean {

src/org/wanxp/douban/data/handler/DoubanGameLoadHandler.ts

@@ -31,7 +31,7 @@ export default class DoubanGameLoadHandler extends DoubanAbstractLoadHandler<Dou
 	parseVariable(beforeContent: string, variableMap:Map<string, DataField>, extract: DoubanGameSubject, context: HandleContext): void {
 		// super.parseAliases(beforeContent, variableMap, extract, context);
 		variableMap.set("aliases", new DataField("aliases", DataValueType.array, extract.aliases,
-			(extract.aliases || []).map(a=>a
+			extract.aliases.map(a=>a
 					.trim()
 				// 		.replace(TITLE_ALIASES_SPECIAL_CHAR_REG_G, '_')
 				// 		//replase multiple _ to single _

src/org/wanxp/douban/data/handler/DoubanMovieLoadHandler.ts

@@ -35,24 +35,24 @@ export default class DoubanMovieLoadHandler extends DoubanAbstractLoadHandler<Do
 			"director",
 			DataValueType.array,
 			extract.director,
-			(extract.director || []).map(SchemaOrg.getPersonName).filter(c => c)
+			extract.director.map(SchemaOrg.getPersonName).filter(c => c)
 		));
 
 		variableMap.set("actor", new DataField(
 			"actor",
 			DataValueType.array,
 			extract.actor,
-			(extract.actor || []).map(SchemaOrg.getPersonName).filter(c => c)
+			extract.actor.map(SchemaOrg.getPersonName).filter(c => c)
 		));
 
 		variableMap.set("author", new DataField(
 			"author",
 			DataValueType.array,
 			extract.author,
-			(extract.author || []).map(SchemaOrg.getPersonName).map(name => super.getPersonName(name, context)).filter(c => c)
+			extract.author.map(SchemaOrg.getPersonName).map(name => super.getPersonName(name, context)).filter(c => c)
 		));
 		variableMap.set("aliases", new DataField("aliases", DataValueType.array, extract.aliases,
-			(extract.aliases || []).map(a=>a
+			extract.aliases.map(a=>a
 					.trim()
 				// 		.replace(TITLE_ALIASES_SPECIAL_CHAR_REG_G, '_')
 				// 		//replase multiple _ to single _
@@ -98,7 +98,7 @@ export default class DoubanMovieLoadHandler extends DoubanAbstractLoadHandler<Do
 	}
 
 	parseSubjectFromHtml(html: CheerioAPI, context: HandleContext): DoubanMovieSubject {
-		let movie: DoubanMovieSubject | undefined = html('script')
+		 const movie:DoubanMovieSubject = html('script')
 			.get()
 			.filter(scd => "application/ld+json" == html(scd).attr("type"))
 			.map(i => {
@@ -119,14 +119,14 @@ export default class DoubanMovieLoadHandler extends DoubanAbstractLoadHandler<Do
 					originalTitle: originalTitle,
 					desc: obj.description,
 					url: "https://movie.douban.com" + obj.url,
-					director: obj.director || [],
-					author: obj.author || [],
-					actor: obj.actor || [],
+					director: obj.director,
+					author: obj.author,
+					actor: obj.actor,
 					aggregateRating: obj.aggregateRating,
 					datePublished: obj.datePublished ? new Date(obj.datePublished) : undefined,
 					image: obj.image,
 					imageUrl: obj.image,
-					genre: obj.genre || [],
+					genre: obj.genre,
 					publisher: '',
 					aliases: [""],
 					language: [""],
@@ -136,48 +136,6 @@ export default class DoubanMovieLoadHandler extends DoubanAbstractLoadHandler<Do
 				}
 				return result;
 			})[0];
-
-		// Fallback: if JSON-LD parsing failed (e.g., anti-bot page), extract from meta tags
-		if (!movie) {
-			const title = html(html("head > meta[property='og:title']").get(0)).attr("content") || '';
-			const image = html(html("head > meta[property='og:image']").get(0)).attr("content") || '';
-			const urlMeta = html(html("head > meta[property='og:url']").get(0)).attr("content") || '';
-			const desc = html(html("head > meta[property='og:description']").get(0)).attr("content") || '';
-
-			// Extract ID from URL
-			const idPattern = /(\d){5,10}/g;
-			const idMatch = idPattern.exec(urlMeta);
-			const id = idMatch ? idMatch[0] : '';
-
-			// Extract score from HTML
-			const scoreText = html("#interest_sectl strong[property='v:average']").text();
-			const score = scoreText ? parseFloat(scoreText) : undefined;
-
-			movie = {
-				id,
-				title,
-				type: this.getSupportType(),
-				score,
-				originalTitle: title,
-				desc,
-				url: urlMeta || (id ? `https://movie.douban.com/subject/${id}/` : ''),
-				director: [],
-				author: [],
-				actor: [],
-				aggregateRating: undefined,
-				datePublished: undefined,
-				image,
-				imageUrl: image,
-				genre: [],
-				publisher: '',
-				aliases: [],
-				language: [],
-				country: [],
-				time: null,
-				IMDb: null,
-			};
-		}
-
 		this.handlePersonNameByMeta(html, movie,  context, 'video:actor', 'actor');
 		this.handlePersonNameByMeta(html, movie,  context, 'video:director', 'director');
 

src/org/wanxp/douban/data/handler/DoubanTeleplayLoadHandler.ts

@@ -25,22 +25,22 @@ export class DoubanTeleplayLoadHandler extends DoubanAbstractLoadHandler<DoubanT
 	}
 
 	parseVariable(beforeContent: string, variableMap:Map<string, DataField>, extract: DoubanTeleplaySubject, context: HandleContext): void {
-		variableMap.set("director", new DataField("director", DataValueType.array, extract.director,(extract.director || []).map(SchemaOrg.getPersonName).filter(c => c)));
+		variableMap.set("director", new DataField("director", DataValueType.array, extract.director,extract.director.map(SchemaOrg.getPersonName).filter(c => c)));
 		variableMap.set("actor", new DataField(
 			"actor",
 			DataValueType.array,
 			extract.actor,
-			(extract.actor || []).map(SchemaOrg.getPersonName).filter(c => c)
+			extract.actor.map(SchemaOrg.getPersonName).filter(c => c)
 		));
 
 		variableMap.set("author", new DataField(
 			"author",
 			DataValueType.array,
 			extract.author,
-			(extract.author || []).map(SchemaOrg.getPersonName).map(name => super.getPersonName(name, context)).filter(c => c)
+			extract.author.map(SchemaOrg.getPersonName).map(name => super.getPersonName(name, context)).filter(c => c)
 		));
 		variableMap.set("aliases", new DataField("aliases", DataValueType.array, extract.aliases,
-			(extract.aliases || []).map(a=>a
+			extract.aliases.map(a=>a
 					.trim()
 				// 		.replace(TITLE_ALIASES_SPECIAL_CHAR_REG_G, '_')
 				// 		//replase multiple _ to single _
@@ -84,7 +84,7 @@ export class DoubanTeleplayLoadHandler extends DoubanAbstractLoadHandler<DoubanT
 	}
 
 	parseSubjectFromHtml(html: CheerioAPI, context: HandleContext): DoubanTeleplaySubject {
-		let teleplay: DoubanTeleplaySubject | undefined = html('script')
+		const teleplay:DoubanTeleplaySubject = html('script')
 			.get()
 			.filter(scd => "application/ld+json" == html(scd).attr("type"))
 			.map(i => {
@@ -104,14 +104,14 @@ export class DoubanTeleplayLoadHandler extends DoubanAbstractLoadHandler<DoubanT
 					originalTitle: originalTitle,
 					desc: obj.description,
 					url: "https://movie.douban.com" + obj.url,
-					director: obj.director || [],
-					author: obj.author || [],
-					actor: obj.actor || [],
+					director: obj.director,
+					author: obj.author,
+					actor: obj.actor,
 					aggregateRating: obj.aggregateRating,
 					datePublished: obj.datePublished ? new Date(obj.datePublished) : undefined,
 					image: obj.image,
 					imageUrl: obj.image,
-					genre: obj.genre || [],
+					genre: obj.genre,
 					score: obj.aggregateRating ? obj.aggregateRating.ratingValue : undefined,
 					publisher: "",
 					aliases: [""],
@@ -124,46 +124,6 @@ export class DoubanTeleplayLoadHandler extends DoubanAbstractLoadHandler<DoubanT
 				return result;
 			})[0];
 
-		// Fallback: if JSON-LD parsing failed, extract from meta tags
-		if (!teleplay) {
-			const title = html(html("head > meta[property='og:title']").get(0)).attr("content") || '';
-			const image = html(html("head > meta[property='og:image']").get(0)).attr("content") || '';
-			const urlMeta = html(html("head > meta[property='og:url']").get(0)).attr("content") || '';
-			const desc = html(html("head > meta[property='og:description']").get(0)).attr("content") || '';
-
-			const idPattern = /(\d){5,10}/g;
-			const idMatch = idPattern.exec(urlMeta);
-			const id = idMatch ? idMatch[0] : '';
-
-			const scoreText = html("#interest_sectl strong[property='v:average']").text();
-			const score = scoreText ? parseFloat(scoreText) : undefined;
-
-			teleplay = {
-				id,
-				title,
-				type: this.getSupportType(),
-				score,
-				originalTitle: title,
-				desc,
-				url: urlMeta || (id ? `https://movie.douban.com/subject/${id}/` : ''),
-				director: [],
-				author: [],
-				actor: [],
-				aggregateRating: undefined,
-				datePublished: undefined,
-				image,
-				imageUrl: image,
-				genre: [],
-				publisher: '',
-				aliases: [],
-				language: [],
-				country: [],
-				episode: null,
-				time: null,
-				IMDb: null,
-			};
-		}
-
 		this.handlePersonNameByMeta(html, teleplay,  context, 'video:actor', 'actor');
 		this.handlePersonNameByMeta(html, teleplay,  context, 'video:director', 'director');
 		const desc:string = html("span[property='v:summary']").text();

src/org/wanxp/douban/data/handler/DoubanTheaterLoadHandler.ts

@@ -33,28 +33,28 @@ export default class DoubanTheaterLoadHandler extends DoubanAbstractLoadHandler<
 			"director",
 			DataValueType.array,
 			extract.director,
-			(extract.director || []).map(SchemaOrg.getPersonName).filter(c => c)
+			extract.director.map(SchemaOrg.getPersonName).filter(c => c)
 		));
 
 		variableMap.set("actor", new DataField(
 			"actor",
 			DataValueType.array,
 			extract.actor,
-			(extract.actor || []).map(SchemaOrg.getPersonName).filter(c => c)
+			extract.actor.map(SchemaOrg.getPersonName).filter(c => c)
 		));
 
 		variableMap.set("author", new DataField(
 			"author",
 			DataValueType.array,
 			extract.author,
-			(extract.author || []).map(SchemaOrg.getPersonName).map(name => super.getPersonName(name, context)).filter(c => c)
+			extract.author.map(SchemaOrg.getPersonName).map(name => super.getPersonName(name, context)).filter(c => c)
 		));
 
 		variableMap.set("aliases", new DataField(
 			"aliases",
 			DataValueType.array,
 			extract.aliases,
-			(extract.aliases || []).map(a => a
+			extract.aliases.map(a => a
 				.trim()
 				.replace(TITLE_ALIASES_SPECIAL_CHAR_REG_G, '_')
 				//replace multiple _ to single _

src/org/wanxp/douban/data/search/parser/AllFirstPageSearchResultPageParser.ts

@@ -3,7 +3,8 @@ import {
 } from "../../../../constant/Constsant";
 import {SearchResultPageParserInterface} from "./SearchResultPageParserInterface";
 import {SearchPage} from "../../model/SearchPage";
-import SearchParserHandler from "../SearchParser";
+import SearchParserHandlerV2 from "../SearchParserV2";
+import StringUtil from "../../../../utils/StringUtil";
 import {log} from "../../../../utils/Logutil";
 
 export class AllFirstPageSearchResultPageParser implements SearchResultPageParserInterface {
@@ -11,11 +12,22 @@ export class AllFirstPageSearchResultPageParser implements SearchResultPageParse
 		return pageNum == 1 && type == SupportType.all;
 	}
 	parse(source:string, type:SupportType, pageNum:number, pageSize:number):SearchPage {
-		log.debug("解析给多页面结果");
-		if (!source) {
-			return new SearchPage(0, 0, 0, type, []);
+		if (!source || StringUtil.notJsonString(source)) {
+			//TODO 国际化
+			log.notice("Obsidian-Douban:查询结果为空，无匹配结果，请尝试登录获取获取更多数据(已登录则忽略)");
+			return SearchPage.empty(type);
 		}
-		return SearchParserHandler.parseSearchJson(source, type, pageNum);
+
+		const {subjects} = JSON.parse(source);
+		if (!subjects) {
+			return SearchPage.empty(type);
+		}
+		const {items} = subjects;
+		if (!items ||items.length == 0) {
+			return SearchPage.empty(type);
+		}
+		const doubanSearchResultSubjects = SearchParserHandlerV2.itemMapToSearchResult(items);
+		return new SearchPage(2000, pageNum, pageSize, type, doubanSearchResultSubjects);
 	}
 
 

src/org/wanxp/douban/data/search/parser/OtherAllPageSearchResultPageParser.ts

@@ -2,7 +2,7 @@ import {SupportType} from "../../../../constant/Constsant";
 import {SearchResultPageParserInterface} from "./SearchResultPageParserInterface";
 import {log} from "../../../../utils/Logutil";
 import {SearchPage} from "../../model/SearchPage";
-import SearchParserHandler from "../SearchParser";
+import SearchParserHandlerV2 from "../SearchParserV2";
 
 export class OtherAllPageSearchResultPageParser implements SearchResultPageParserInterface {
 	support(type:SupportType, pageNum:number):boolean {
@@ -10,10 +10,13 @@ export class OtherAllPageSearchResultPageParser implements SearchResultPageParse
 	}
 	parse(source:string, type:SupportType, pageNum:number, pageSize:number):SearchPage {
 		log.debug("解析给多页面结果");
-		if (!source) {
+		const {contents} = JSON.parse(source);
+		if (!contents) {
 			return new SearchPage(0, 0, 0, type, []);
 		}
-		return SearchParserHandler.parseSearchJson(source, type, pageNum);
+		const data:{total:number, start:number, count:number, items:any[]} = contents;
+		const doubanSearchResultSubjects = SearchParserHandlerV2.itemMapToSearchResult(data.items);
+		return new SearchPage(data.total, pageNum, pageSize, type, doubanSearchResultSubjects);
 	}
 
 }

src/org/wanxp/douban/data/search/searcher/AllPageSearchPageFetcher.ts

@@ -2,8 +2,8 @@ import {AbstractSearchPageFetcher} from "./AbstractSearchPageFetcher";
 import { SupportType } from "src/org/wanxp/constant/Constsant";
 
 export class AllPageSearchPageFetcher extends AbstractSearchPageFetcher  {
-    getUrl(keyword: string, start: number, pageSize: number): string {
-       return  `https://www.douban.com/j/search?q=${keyword}&start=${start}`;
+    getUrl(keyword: string, pageNum: number, pageSize: number): string {
+       return  `https://m.douban.com/rexxar/api/v2/search?q=${keyword}&start=${pageNum}&count=${pageSize}`;
     }
     support(type: SupportType): boolean {
 		return type == SupportType.all;

src/org/wanxp/douban/setting/LoginSettingsHelper.ts

@@ -10,16 +10,16 @@ export function constructLoginUI(containerEl: HTMLElement, manager: SettingsMana
 	// containerEl.createEl('h3', { text: i18nHelper.getMessage('1210') });
 
 	const userComponent = manager.plugin.userComponent;
-	if (userComponent.isLogin() && !userComponent.isVerified()) {
-		// Assumed login — verify to get user ID/name for settings display
+	if (userComponent.needLogin()) {
+		try {
 			userComponent.login()
-			.then(() => constructDoubanLoginSettingsUI(containerEl, manager))
-			.catch(() => constructDoubanLoginSettingsUI(containerEl, manager));
-	} else if (userComponent.needLogin()) {
-		// Has credentials but not yet logged in
-		userComponent.login()
-			.then(() => constructDoubanLoginSettingsUI(containerEl, manager))
-			.catch(() => constructDoubanLoginSettingsUI(containerEl, manager));
+				.then(() => {
+					constructDoubanLoginSettingsUI(containerEl, manager);
+				});
+		}catch (e) {
+			log.debug(i18nHelper.getMessage('100101'));
+			constructDoubanLoginSettingsUI(containerEl, manager);
+		}
 	}else {
 		constructDoubanLoginSettingsUI(containerEl, manager);
 	}

src/org/wanxp/douban/user/UserComponent.ts

@@ -15,7 +15,6 @@ import {DoubanHttpUtil} from "../../utils/DoubanHttpUtil";
 export default class UserComponent {
 	private settingsManager: SettingsManager;
 	private user: User;
-	private verified: boolean = false;
 
 	constructor(settingsManager: SettingsManager) {
 		this.settingsManager = settingsManager;
@@ -40,26 +39,11 @@ export default class UserComponent {
 			this.user.login = false;
 		}
 		this.user = null;
-		this.verified = false;
 		this.settingsManager.updateSetting('loginCookiesContent', '');
 		this.settingsManager.updateSetting('loginHeadersContent', '');
 
 	}
 
-	assumeLoggedIn(): void {
-		const headers: any = this.settingsManager.getSetting('loginHeadersContent');
-		const cookies: any = this.settingsManager.getSetting('loginCookiesContent');
-		if (headers || cookies) {
-			this.user = new User();
-			this.user.login = true;
-			this.verified = false;
-		}
-	}
-
-	isVerified(): boolean {
-		return this.verified;
-	}
-
 
 
 	needLogin() {
@@ -84,7 +68,6 @@ export default class UserComponent {
 			this.settingsManager.debug(`配置界面:loginCookie:豆瓣headers信息正常，${user&&user.id?'获取用户信息成功id:'+ StringUtil.confuse(user.id) + ',用户名:'+ StringUtil.confuse(user.name) :'获取用户信息失败'}`);
 		});
 		if(this.user) {
-			this.verified = true;
 			this.settingsManager.updateSetting('loginHeadersContent', JSON.stringify(headers));
 		}
 		return this.user;
@@ -156,9 +139,6 @@ export default class UserComponent {
 			this.user = user;
 			this.settingsManager.debug(`主界面:loginByCookie:豆瓣cookies信息正常，${user&&user.id?'获取用户信息成功id:'+ StringUtil.confuse(user.id) + ',用户名:'+ StringUtil.confuse(user.name) :'获取用户信息失败'}`);
 		});
-		if (this.user && this.user.id) {
-			this.verified = true;
-		}
 		return this.user;
 	}
 }

src/org/wanxp/lang/locale/en.ts

@@ -335,8 +335,6 @@ PS: This file could be delete if you want to.
 	'130105': `Can not use Douban this time, Please try again after 12 hour or 24 hour. Or you can reset your connection `,
 	'130106': `Can not use Douban this time, Please try Login In Douban Plugin. If not working please again after 12 hour or 24 hour. Or you can reset your connection `,
 	'130404': `404 Url Not Found`,
-	'130109': `Downloaded image is empty`,
-	'130110': `Clipboard write failed`,
 
 
 	'130107': `Can not find array setting for {1} in {0} , Please add it in array settings`,

src/org/wanxp/lang/locale/zh-cn.ts

@@ -350,8 +350,6 @@ export default {
 	'130105': `由于多次频繁请求数据，豆瓣当前暂时不可用. 请于12小时或24小时后再重试，或重置你的网络(如重新拨号或更换网络) `,
 	'130106': `请尝试在Douban插件中登录后操作. 若还是无效果则尝试于12小时或24小时后再重试，或重置你的网络(如重新拨号或更换网络) `,
 	'130107': `参数{0}中指定的数组输出类型{1}不存在，请前往配置进行设置`,
-	'130109': `下载图片内容为空`,
-	'130110': `写入剪贴板失败`,
 	'130120': `同步时发生错误，但同步将会继续。错误项目是 {}。`,
 	'130121': `总数只有{0}, 选择的开始比总数还要大，将不会同步。`,
 

src/org/wanxp/main.ts

@@ -286,7 +286,6 @@ export default class DoubanPlugin extends Plugin {
 		// this.fetchOnlineData(this.settingsManager);
 		this.userComponent = new UserComponent(this.settingsManager);
 		this.netFileHandler = new NetFileHandler(this.fileHandler);
-		this.userComponent.assumeLoggedIn();
 
 		this.settingTab = new DoubanSettingTab(this.app, this);
 		this.addSettingTab(this.settingTab);
@@ -356,16 +355,11 @@ export default class DoubanPlugin extends Plugin {
 
 	async checkLogin(context: HandleContext):Promise<boolean> {
 		this.settingsManager.debug('主界面:同步时的登录状态检测');
-		const uc = context.userComponent;
-		// If assumed-logged-in but not verified, verify now (sync needs real user ID)
-		if (uc.isLogin() && !uc.isVerified()) {
-			await uc.login();
+		if (!context.userComponent.needLogin()) {
+			this.settingsManager.debug('主界面:同步时的登录状态检测完成: 无用户信息, 尝试获取用户信息');
+			await context.userComponent.login();
 		}
-		// If has saved credentials but not logged in, try login
-		if (uc.needLogin()) {
-			await uc.login();
-		}
-		if (!uc.isLogin()) {
+		if (!context.userComponent.isLogin()) {
 			this.settingsManager.debug('主界面:同步时的登录状态检测完成: 尝试获取用户信息失败');
 			new Notice(i18nHelper.getMessage('140303'));
 			return false;

src/org/wanxp/net/NetFileHandler.ts

@@ -25,9 +25,6 @@ export default class NetFileHandler {
 				if (response.status == 403) {
 					throw new Error(i18nHelper.getMessage('130106'));
 				}
-					if (response.status == 418) {
-						throw new Error(i18nHelper.getMessage('130105'));
-					}
 				return response.textArrayBuffer;
 			})
 			.then((buffer) => {
@@ -59,23 +56,15 @@ export default class NetFileHandler {
 	async downloadDBUploadPicGoByClipboard(url: string, filename: string, context:HandleContext, showError:boolean, headers?:any): Promise<{ success: boolean, error:string, filepath: string }> {
 		return HttpUtil.httpRequestBuffer(url, headers, context.plugin.settingsManager)
 			.then((response) => {
-				if (response.status == 404) {
-					throw new Error(i18nHelper.getMessage('130404'));
-				}
 				if (response.status == 403) {
 					throw new Error(i18nHelper.getMessage('130106'));
 				}
-				if (response.status == 418) {
-					throw new Error(i18nHelper.getMessage('130105'));
-				}
 				return response.textArrayBuffer;
 			})
-				.then(async (buffer) => {
-					if (!buffer || buffer.byteLength == 0) {
-						throw new Error(i18nHelper.getMessage('130109'));
-					}
-					await ClipboardUtil.writeImage(buffer);
-					return await this.uploadClipboardFile(context);
+			.then((buffer) => {
+				ClipboardUtil.writeImage(buffer);
+			}).then(() => {
+				return this.uploadClipboardFile(context);
 			}).then((data) => {
 				if (data.success) {
 					return {success: true, error: '', filepath: HttpUtil.extractURLFromString(data.result[0])};
@@ -119,3 +108,4 @@ export default class NetFileHandler {
 	}
 }
 
+

src/org/wanxp/utils/ClipboardUtil.ts

@@ -1,80 +1,14 @@
 
 
-import {i18nHelper} from "../lang/helper";
-
 export class ClipboardUtil {
 
 	public static async writeImage(data:ArrayBuffer, options: ClipboardOptions = defaultClipboardOptions) {
-			if (!data || data.byteLength == 0) {
-				throw new Error(i18nHelper.getMessage('130110'));
-			}
 		const { clipboard, nativeImage } = require('electron');
-			const isWebp = this.isWebp(data);
-			let image = nativeImage.createFromBuffer(Buffer.from(data));
-			if ((!image || image.isEmpty()) && isWebp) {
-				image = await this.createNativeImageFromWebp(data);
-			}
-			if (!image || image.isEmpty()) {
-				throw new Error(i18nHelper.getMessage('130110'));
-			}
-			clipboard.clear();
-			clipboard.writeImage(image);
-			await new Promise(resolve => setTimeout(resolve, 100));
-			const clipboardImage = clipboard.readImage();
-			if (!clipboardImage || clipboardImage.isEmpty()) {
-				throw new Error(i18nHelper.getMessage('130110'));
-			}
+
+		await clipboard.writeImage(nativeImage.createFromBuffer(data));
 		console.log(`Copied to clipboard as HTML`);
 	}
 
-	private static isWebp(data: ArrayBuffer): boolean {
-		const bytes = new Uint8Array(data);
-		if (bytes.length < 12) {
-			return false;
-		}
-		return bytes[0] === 0x52
-			&& bytes[1] === 0x49
-			&& bytes[2] === 0x46
-			&& bytes[3] === 0x46
-			&& bytes[8] === 0x57
-			&& bytes[9] === 0x45
-			&& bytes[10] === 0x42
-			&& bytes[11] === 0x50;
-	}
-
-	private static async createNativeImageFromWebp(data: ArrayBuffer) {
-		const { nativeImage } = require('electron');
-		const imageElement = await this.loadImage(URL.createObjectURL(new Blob([data], {type: 'image/webp'})));
-			try {
-				const canvas = document.createElement('canvas');
-				canvas.width = imageElement.naturalWidth || imageElement.width;
-				canvas.height = imageElement.naturalHeight || imageElement.height;
-				const context = canvas.getContext('2d');
-				if (!context) {
-					throw new Error(i18nHelper.getMessage('130110'));
-				}
-				context.drawImage(imageElement, 0, 0);
-				return nativeImage.createFromDataURL(canvas.toDataURL('image/png'));
-		} finally {
-			imageElement.src = '';
-		}
-	}
-
-	private static loadImage(url: string): Promise<HTMLImageElement> {
-		return new Promise((resolve, reject) => {
-			const image = new Image();
-			image.onload = () => {
-				URL.revokeObjectURL(url);
-				resolve(image);
-			};
-				image.onerror = () => {
-					URL.revokeObjectURL(url);
-					reject(new Error(i18nHelper.getMessage('130110')));
-				};
-				image.src = url;
-			});
-	}
-
 }
 
 
@@ -86,3 +20,4 @@ interface ClipboardOptions {
 const defaultClipboardOptions: ClipboardOptions = {
 	contentType: 'text/plain',
 }
+

src/org/wanxp/utils/HttpUtil.ts

@@ -7,19 +7,6 @@ import {HttpResponse} from "./model/HttpResponse";
 
 export default class HttpUtil {
 
-	private static readonly IMAGE_REQUEST_HEADERS_TO_DROP = new Set([
-		'authority',
-		'content-length',
-		'content-type',
-		'host',
-		'origin',
-		'referer',
-		'sec-fetch-dest',
-		'sec-fetch-mode',
-		'sec-fetch-site',
-		'sec-fetch-user',
-	]);
-
 
 
 	/**
@@ -73,27 +60,6 @@ export default class HttpUtil {
 		}
 	}
 
-	public static buildImageRequestHeaders(headers: Record<string, any> = {}, referer?: string): Record<string, string> {
-		const nextHeaders: Record<string, string> = {};
-		Object.entries(headers || {}).forEach(([key, value]) => {
-			if (value == null || value === '') {
-				return;
-			}
-			const lowerKey = key.toLowerCase();
-			if (lowerKey === 'referer') {
-				return;
-			}
-			if (this.IMAGE_REQUEST_HEADERS_TO_DROP.has(lowerKey) || lowerKey.startsWith('sec-ch-ua')) {
-				return;
-			}
-			nextHeaders[key] = String(value);
-		});
-		if (referer) {
-			nextHeaders.Referer = referer;
-		}
-		return nextHeaders;
-	}
-
 
 	public static parse(url: string): { protocol: string, host: string, port: string, path: string } {
 		const regex = /^(.*?):\/\/([^\/:]+)(?::(\d+))?([^?]*)$/;

versions.json

@@ -61,7 +61,6 @@
 	"2.2.3": "0.12.0",
 	"2.2.4": "0.12.0",
 	"2.3.0": "0.12.0",
-	"2.3.1": "0.12.0",
-	"2.3.2": "0.12.0"
+	"2.3.1": "0.12.0"
 
 }