opensource/obsidian-douban
1
0
Fork 0
mirror of https://github.com/Wanxp/obsidian-douban.git synced 2026-04-04 16:48:44 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

upgrade version to v1.6.2

Browse Source
This commit is contained in:
wanxp 2022-11-11 21:08:40 +08:00
parent cbdefbd049
commit 7417862eb1
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/douban/data/handler/DoubanAbstractLoadHandler.ts
View File

@ -141,7 +141,7 @@ export default abstract class DoubanAbstractLoadHandler<T extends DoubanSubject>
}; };
request(requestUrlParam) request(requestUrlParam)
.then(load) .then(load)
.then(this.analysisUserState) .then(data => this.analysisUserState(data, context))
.then(({data, userState}) => { .then(({data, userState}) => {
let sub = this.parseSubjectFromHtml(data); let sub = this.parseSubjectFromHtml(data);
sub.userState = userState; sub.userState = userState;
@ -309,10 +309,13 @@ export default abstract class DoubanAbstractLoadHandler<T extends DoubanSubject>
private async getTemplate(extract: T, context: HandleContext): Promise<string> { private async getTemplate(extract: T, context: HandleContext): Promise<string> {
const tempKey: TemplateKey = this.getTemplateKey(); const tempKey: TemplateKey = this.getTemplateKey();
const templatePath: string = context.settings[tempKey]; const templatePath: string = context.settings[tempKey];
const useUserState:boolean = context.userComponent.isLogin() && let useUserState:boolean = context.userComponent.isLogin() &&
extract.userState && extract.userState &&
extract.userState.collectionDate != null && extract.userState.collectionDate != null &&
extract.userState.collectionDate != undefined; extract.userState.collectionDate != undefined;
useUserState = useUserState ? useUserState : false;
// @ts-ignore // @ts-ignore
if (!templatePath || StringUtil.isBlank(templatePath)) { if (!templatePath || StringUtil.isBlank(templatePath)) {
return getDefaultTemplateContent(tempKey, useUserState); return getDefaultTemplateContent(tempKey, useUserState);
@ -327,9 +330,12 @@ export default abstract class DoubanAbstractLoadHandler<T extends DoubanSubject>
} }
} }
analysisUserState(html: CheerioAPI): {data:CheerioAPI , userState: UserStateSubject} { analysisUserState(html: CheerioAPI, context: HandleContext): {data:CheerioAPI , userState: UserStateSubject} {
if (!context.userComponent.isLogin()) {
return {data: html, userState: null};
}
if(!html('.nav-user-account')) { if(!html('.nav-user-account')) {
return null; return {data: html, userState: null};
} }
let rate = html(html('input#n_rating').get(0)).val(); 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 tagsStr = html(html('div#interest_sect_level > div.a_stars > span.color_gray').get(0)).text().trim();