diff --git a/README.md b/README.md index 3b445a2..a55d6d2 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ If you want some features or have any questions about this plugin, create issues - [Development Roadmap](https://github.com/users/Wanxp/projects/1) ## Support Field/支持的字段 - (若有字段缺失, 欢迎提issues反馈) + (若有缺少想导入的字段, 欢迎提issues反馈) --- | 字段 | 电影 | 电视剧 | 书籍 | 音乐 | 日记 | 游戏 | 广播 | diff --git a/src/douban/DoubanSettingTab.ts b/src/douban/DoubanSettingTab.ts index 68d73f1..86c5504 100644 --- a/src/douban/DoubanSettingTab.ts +++ b/src/douban/DoubanSettingTab.ts @@ -59,6 +59,117 @@ export class DoubanSettingTab extends PluginSettingTab { }); }); + new Setting(containerEl).setName(i18nHelper.getMessage('120501')).then((setting) => { + setting.addMomentFormat((mf) => { + setting.descEl.appendChild( + createFragment((frag) => { + frag.appendText( + i18nHelper.getMessage('120503') + ); + frag.createEl('br'); + frag.appendText(i18nHelper.getMessage('120506') + ' '); + frag.createEl( + 'a', + { + text: i18nHelper.getMessage('120508'), + href: 'https://momentjs.com/docs/#/displaying/format/', + }, + (a) => { + a.setAttr('target', '_blank'); + } + ); + frag.createEl('br'); + frag.appendText(i18nHelper.getMessage('120507') + ': '); + mf.setSampleEl(frag.createEl('b', {cls: 'u-pop'})); + frag.createEl('br'); + }) + ); + mf.setPlaceholder(DEFAULT_SETTINGS.dateFormat); + mf.setValue(this.plugin.settings.dateFormat) + mf.onChange(async (value) => { + this.plugin.settings.dateFormat = value; + await this.plugin.saveSettings(); + }); + + }); + }); + + new Setting(containerEl).setName(i18nHelper.getMessage('120502')).then((setting) => { + setting.addMomentFormat((mf) => { + setting.descEl.appendChild( + createFragment((frag) => { + frag.appendText( + i18nHelper.getMessage('120504') + ); + frag.createEl('br'); + frag.appendText(i18nHelper.getMessage('120506') + ' '); + frag.createEl( + 'a', + { + text: i18nHelper.getMessage('120508'), + href: 'https://momentjs.com/docs/#/displaying/format/', + }, + (a) => { + a.setAttr('target', '_blank'); + } + ); + frag.createEl('br'); + frag.appendText(i18nHelper.getMessage('120507') + ': '); + mf.setSampleEl(frag.createEl('b', {cls: 'u-pop'})); + frag.createEl('br'); + }) + ); + mf.setPlaceholder(DEFAULT_SETTINGS.timeFormat); + mf.setValue(this.plugin.settings.timeFormat) + mf.onChange(async (value) => { + this.plugin.settings.timeFormat = value; + await this.plugin.saveSettings(); + }); + + }); + }); + + + new Setting(containerEl) + .setName(i18nHelper.getMessage('120601')) + .setDesc(i18nHelper.getMessage('120602')) + .addText((textField) => { + textField.setPlaceholder(DEFAULT_SETTINGS.arraySpilt) + .setValue(this.plugin.settings.arraySpilt) + .onChange(async (value) => { + this.plugin.settings.arraySpilt = value; + await this.plugin.saveSettings(); + }); + }); + + new Setting(containerEl).setName(i18nHelper.getMessage('121201')).then((setting) => { + setting.addDropdown((dropdwon) => { + setting.descEl.appendChild( + createFragment((frag) => { + frag.appendText(i18nHelper.getMessage('121202')); + frag.createEl('br'); + frag.appendText(i18nHelper.getMessage('121203')); + frag.createEl('br'); + frag.appendText(i18nHelper.getMessage('121204')); + frag.createEl('br'); + frag.appendText(i18nHelper.getMessage('121205')); + frag.createEl('br'); + }) + ); + // dropdwon.inputEl.addClass("settings_area"); + // dropdwon.inputEl.setAttr("rows", 10); + dropdwon.addOption(PersonNameMode.CH_NAME, PersonNameModeRecords.CH) + dropdwon.addOption(PersonNameMode.EN_NAME, PersonNameModeRecords.EN) + dropdwon.addOption(PersonNameMode.CH_EN_NAME, PersonNameModeRecords.CH_EN) + dropdwon.setValue(this.plugin.settings.personNameMode) + .onChange(async (value: string) => { + this.plugin.settings.personNameMode = value as PersonNameMode; + await this.plugin.saveSettings(); + }); + }); + }); + + new Setting(containerEl).setName(i18nHelper.getMessage('120101')).then((setting) => { setting.addTextArea((textarea) => { setting.descEl.appendChild( @@ -233,116 +344,7 @@ export class DoubanSettingTab extends PluginSettingTab { }); }) - new Setting(containerEl).setName(i18nHelper.getMessage('121201')).then((setting) => { - setting.addDropdown((dropdwon) => { - setting.descEl.appendChild( - createFragment((frag) => { - frag.appendText(i18nHelper.getMessage('121202')); - frag.createEl('br'); - frag.appendText(i18nHelper.getMessage('121203')); - frag.createEl('br'); - frag.appendText(i18nHelper.getMessage('121204')); - frag.createEl('br'); - frag.appendText(i18nHelper.getMessage('121205')); - frag.createEl('br'); - }) - ); - // dropdwon.inputEl.addClass("settings_area"); - // dropdwon.inputEl.setAttr("rows", 10); - dropdwon.addOption(PersonNameMode.CH_NAME, PersonNameModeRecords.CH) - dropdwon.addOption(PersonNameMode.EN_NAME, PersonNameModeRecords.EN) - dropdwon.addOption(PersonNameMode.CH_EN_NAME, PersonNameModeRecords.CH_EN) - dropdwon.setValue(this.plugin.settings.personNameMode) - .onChange(async (value: string) => { - this.plugin.settings.personNameMode = value as PersonNameMode; - await this.plugin.saveSettings(); - }); - }); - }); - new Setting(containerEl).setName(i18nHelper.getMessage('120501')).then((setting) => { - setting.addMomentFormat((mf) => { - setting.descEl.appendChild( - createFragment((frag) => { - frag.appendText( - i18nHelper.getMessage('120503') - ); - frag.createEl('br'); - frag.appendText(i18nHelper.getMessage('120506') + ' '); - frag.createEl( - 'a', - { - text: i18nHelper.getMessage('120508'), - href: 'https://momentjs.com/docs/#/displaying/format/', - }, - (a) => { - a.setAttr('target', '_blank'); - } - ); - frag.createEl('br'); - frag.appendText(i18nHelper.getMessage('120507') + ': '); - mf.setSampleEl(frag.createEl('b', {cls: 'u-pop'})); - frag.createEl('br'); - }) - ); - mf.setPlaceholder(DEFAULT_SETTINGS.dateFormat); - mf.setValue(this.plugin.settings.dateFormat) - mf.onChange(async (value) => { - this.plugin.settings.dateFormat = value; - await this.plugin.saveSettings(); - }); - - }); - }); - - new Setting(containerEl).setName(i18nHelper.getMessage('120502')).then((setting) => { - setting.addMomentFormat((mf) => { - setting.descEl.appendChild( - createFragment((frag) => { - frag.appendText( - i18nHelper.getMessage('120504') - ); - frag.createEl('br'); - frag.appendText(i18nHelper.getMessage('120506') + ' '); - frag.createEl( - 'a', - { - text: i18nHelper.getMessage('120508'), - href: 'https://momentjs.com/docs/#/displaying/format/', - }, - (a) => { - a.setAttr('target', '_blank'); - } - ); - frag.createEl('br'); - frag.appendText(i18nHelper.getMessage('120507') + ': '); - mf.setSampleEl(frag.createEl('b', {cls: 'u-pop'})); - frag.createEl('br'); - }) - ); - mf.setPlaceholder(DEFAULT_SETTINGS.timeFormat); - mf.setValue(this.plugin.settings.timeFormat) - mf.onChange(async (value) => { - this.plugin.settings.timeFormat = value; - await this.plugin.saveSettings(); - }); - - }); - }); - - - new Setting(containerEl) - .setName(i18nHelper.getMessage('120601')) - .setDesc(i18nHelper.getMessage('120602')) - .addText((textField) => { - textField.setPlaceholder(DEFAULT_SETTINGS.arraySpilt) - .setValue(this.plugin.settings.arraySpilt) - .onChange(async (value) => { - this.plugin.settings.arraySpilt = value; - await this.plugin.saveSettings(); - }); - }); - } } diff --git a/src/douban/data/handler/DoubanBookLoadHandler.ts b/src/douban/data/handler/DoubanBookLoadHandler.ts index 02f367d..d4cd047 100644 --- a/src/douban/data/handler/DoubanBookLoadHandler.ts +++ b/src/douban/data/handler/DoubanBookLoadHandler.ts @@ -2,9 +2,10 @@ import {CheerioAPI} from 'cheerio'; import DoubanAbstractLoadHandler from "./DoubanAbstractLoadHandler"; import DoubanBookSubject, {DoubanBookParameter} from "../model/DoubanBookSubject"; import DoubanPlugin from "main"; -import {DoubanPluginSettings} from "src/douban/Douban"; +import {DEFAULT_SETTINGS, DoubanPluginSettings} from "src/douban/Douban"; import DoubanSubject from "../model/DoubanSubject"; import {TemplateTextMode} from "../../../constant/Constsant"; +import StringUtil from "../../../utils/StringUtil"; export default class DoubanBookLoadHandler extends DoubanAbstractLoadHandler { @@ -13,7 +14,7 @@ export default class DoubanBookLoadHandler extends DoubanAbstractLoadHandler { @@ -17,7 +18,7 @@ export default class DoubanGameLoadHandler extends DoubanAbstractLoadHandler { @@ -13,7 +14,7 @@ export default class DoubanMovieLoadHandler extends DoubanAbstractLoadHandler { @@ -12,7 +13,7 @@ export default class DoubanMusicLoadHandler extends DoubanAbstractLoadHandler { @@ -13,7 +14,7 @@ export default class DoubanNoteLoadHandler extends DoubanAbstractLoadHandler