From c2ce0c5e0d59be00117513f48d196bc3180a9360 Mon Sep 17 00:00:00 2001 From: HughWan <977741432@qq.com> Date: Tue, 26 Dec 2023 16:40:39 +0800 Subject: [PATCH] fix actor/director's name lost space charactor --- .../data/handler/DoubanAbstractLoadHandler.ts | 18 ++++-------------- .../data/handler/DoubanMovieLoadHandler.ts | 2 +- .../data/handler/DoubanTeleplayLoadHandler.ts | 2 +- 3 files changed, 6 insertions(+), 16 deletions(-) diff --git a/src/org/wanxp/douban/data/handler/DoubanAbstractLoadHandler.ts b/src/org/wanxp/douban/data/handler/DoubanAbstractLoadHandler.ts index 6520938..0ee1afe 100644 --- a/src/org/wanxp/douban/data/handler/DoubanAbstractLoadHandler.ts +++ b/src/org/wanxp/douban/data/handler/DoubanAbstractLoadHandler.ts @@ -85,20 +85,7 @@ export default abstract class DoubanAbstractLoadHandler return dataFileNamePath ? dataFileNamePath : DEFAULT_SETTINGS.dataFileNamePath; } - /** - * 处理特殊字符 - * @param text - * @param textMode - */ - handleSpecialText(text: string, textMode: TemplateTextMode): string { - let result = text; - switch (textMode) { - case TemplateTextMode.YAML: - result = YamlUtil.handleText(text); - break; - } - return result; - } + @@ -267,6 +254,9 @@ export default abstract class DoubanAbstractLoadHandler private parsePartText(template: string, extract: T, context: HandleContext, textMode: TemplateTextMode = TemplateTextMode.NORMAL): string { const variableMap:Map = new Map(); for (const [key, value] of Object.entries(extract)) { + if (!value) { + continue; + } const type:DataValueType = VariableUtil.getType(value); variableMap.set(key, new DataField(key, type, value, value)); } diff --git a/src/org/wanxp/douban/data/handler/DoubanMovieLoadHandler.ts b/src/org/wanxp/douban/data/handler/DoubanMovieLoadHandler.ts index e7f8947..52a29a3 100644 --- a/src/org/wanxp/douban/data/handler/DoubanMovieLoadHandler.ts +++ b/src/org/wanxp/douban/data/handler/DoubanMovieLoadHandler.ts @@ -100,7 +100,7 @@ export default class DoubanMovieLoadHandler extends DoubanAbstractLoadHandler { let item = html(i).text(); item = super.html_decode(item); - const obj = JSON.parse(item.replace(/[\r\n+]/g, '')); + const obj = JSON.parse(item.replace(/[\r\n]+/g, '')); const idPattern = /(\d){5,10}/g; const id = idPattern.exec(obj.url); const name = obj.name; diff --git a/src/org/wanxp/douban/data/handler/DoubanTeleplayLoadHandler.ts b/src/org/wanxp/douban/data/handler/DoubanTeleplayLoadHandler.ts index 5cb6810..7ffa87d 100644 --- a/src/org/wanxp/douban/data/handler/DoubanTeleplayLoadHandler.ts +++ b/src/org/wanxp/douban/data/handler/DoubanTeleplayLoadHandler.ts @@ -86,7 +86,7 @@ export class DoubanTeleplayLoadHandler extends DoubanAbstractLoadHandler { let item = html(i).text(); item = super.html_decode(item); - const obj = JSON.parse(item.replace(/[\r\n\s+]/g, '')); + const obj = JSON.parse(item.replace(/[\r\n]+/g, '')); const idPattern = /(\d){5,10}/g; const id = idPattern.exec(obj.url); const name = obj.name;