diff --git a/README.md b/README.md index 33440e2..c55c4ca 100644 --- a/README.md +++ b/README.md @@ -61,6 +61,9 @@ If you want some features or have any questions about this plugin, create issues ## How to use ### Search +- Search Data And Create Note + 搜索数据并创建笔记 + ![search_and_create](./doc/search_and_create_note.gif) - Search Data By File Name 通过当前文件名搜索 ![Search Movie By File Name](./doc/search_by_file_name.gif) diff --git a/doc/search_and_create_note.gif b/doc/search_and_create_note.gif new file mode 100644 index 0000000..1fa2be6 Binary files /dev/null and b/doc/search_and_create_note.gif differ diff --git a/doc/setting_zh.gif b/doc/setting_zh.gif index 3be360b..b3920ae 100644 Binary files a/doc/setting_zh.gif and b/doc/setting_zh.gif differ diff --git a/src/douban/data/handler/DoubanAbstractLoadHandler.ts b/src/douban/data/handler/DoubanAbstractLoadHandler.ts index 416d7e2..0020b7e 100644 --- a/src/douban/data/handler/DoubanAbstractLoadHandler.ts +++ b/src/douban/data/handler/DoubanAbstractLoadHandler.ts @@ -147,15 +147,18 @@ export default abstract class DoubanAbstractLoadHandler } getPersonName(name: string, context: HandleContext): string { - const {settings} = context; - if (!name || !settings || !settings.personNameMode) { + return this.getPersonNameByMode(name, context.settings.personNameMode); + } + + getPersonNameByMode(name: string, personNameMode: string): string { + if (!name || !personNameMode) { return ""; } let resultName: string; let regValue: RegExpExecArray; - switch (settings.personNameMode) { + switch (personNameMode) { case PersonNameMode.CH_NAME: - regValue = /[\u4e00-\u9fa50-9.]{2,20}/g.exec(name); + regValue = /[\u4e00-\u9fa50-9\. \:\u3002|\uff1f|\uff01|\uff0c|\u3001|\uff1b|\uff1a|\u201c|\u201d|\u2018|\u2019|\uff08|\uff09|\u300a|\u300b|\u3008|\u3009|\u3010|\u3011|\u300e|\u300f|\u300c|\u300d|\ufe43|\ufe44|\u3014|\u3015|\u2026|\u2014|\uff5e|\ufe4f|\uffe5]{2,20}/g.exec(name); resultName = regValue ? regValue[0] : name; break; case PersonNameMode.EN_NAME: diff --git a/src/douban/data/handler/DoubanMovieLoadHandler.ts b/src/douban/data/handler/DoubanMovieLoadHandler.ts index de17cf1..b74d636 100644 --- a/src/douban/data/handler/DoubanMovieLoadHandler.ts +++ b/src/douban/data/handler/DoubanMovieLoadHandler.ts @@ -6,7 +6,7 @@ import DoubanSubject from '../model/DoubanSubject'; import DoubanMovieSubject from '../model/DoubanMovieSubject'; import StringUtil from "../../../utils/StringUtil"; import HandleContext from "@App/data/model/HandleContext"; -import {TemplateKey} from "../../../constant/Constsant"; +import {PersonNameMode, TemplateKey} from "../../../constant/Constsant"; export default class DoubanMovieLoadHandler extends DoubanAbstractLoadHandler { @@ -43,11 +43,8 @@ export default class DoubanMovieLoadHandler extends DoubanAbstractLoadHandler