From b365af80be48f46c27a6114fffc41242ac94718e Mon Sep 17 00:00:00 2001 From: chris Date: Tue, 24 May 2022 11:02:44 +0800 Subject: [PATCH] Remove no-use code --- Upload2Notion.ts | 9 ++-- main.ts | 116 +++++++++++++---------------------------------- 2 files changed, 38 insertions(+), 87 deletions(-) diff --git a/Upload2Notion.ts b/Upload2Notion.ts index 522c685..509c645 100644 --- a/Upload2Notion.ts +++ b/Upload2Notion.ts @@ -58,12 +58,15 @@ export class Upload2Notion { async updateYamlInfo(yamlContent: string, fullPath: string, res: any) { const yamlObj:any = yamlFrontMatter.loadFront(yamlContent); const {url} = res.json - yamlObj.shareUrl = url; + yamlObj.link = url; const __content = yamlObj.__content; delete yamlObj.__content const yamlhead = yaml.stringify(yamlObj) - - const content = '---\n' +yamlhead +'\n---\n' + __content; + // if yamlhead hava last \n remove it + const yamlhead_remove_n = yamlhead.replace(/\n$/, '') + // if __content have start \n remove it + const __content_remove_n = __content.replace(/^\n/, '') + const content = '---\n' +yamlhead_remove_n +'\n---\n' + __content_remove_n; //write content fo file fs.writeFileSync(fullPath, content); diff --git a/main.ts b/main.ts index c818249..cf460f1 100644 --- a/main.ts +++ b/main.ts @@ -42,7 +42,38 @@ export default class MyPlugin extends Plugin { "share to notion", async (evt: MouseEvent) => { // Called when the user clicks the icon. - const { notionAPI, databaseID } = this.settings; + this.upload(); + } + ); + // Perform additional things with the ribbon + ribbonIconEl.addClass("my-plugin-ribbon-class"); + + // This adds a status bar item to the bottom of the app. Does not work on mobile apps. + const statusBarItemEl = this.addStatusBarItem(); + statusBarItemEl.setText("This is made for love"); + + this.addCommand({ + id: "share-to-notion", + name: "share to notion", + editorCallback: async (editor: Editor, view: MarkdownView) => { + this.upload() + }, + }); + + + // This adds a settings tab so the user can configure various aspects of the plugin + this.addSettingTab(new SampleSettingTab(this.app, this)); + + // When registering intervals, this function will automatically clear the interval when the plugin is disabled. + this.registerInterval( + window.setInterval(() => console.log("setInterval"), 5 * 60 * 1000) + ); + } + + onunload() {} + + async upload(){ + const { notionAPI, databaseID } = this.settings; if (notionAPI === "" || databaseID === "") { new Notice( "Please set up the notion API and database ID in the settings tab." @@ -62,78 +93,8 @@ export default class MyPlugin extends Plugin { new Notice(`${basename}同步失败`) } } - } - ); - // Perform additional things with the ribbon - ribbonIconEl.addClass("my-plugin-ribbon-class"); - - // This adds a status bar item to the bottom of the app. Does not work on mobile apps. - const statusBarItemEl = this.addStatusBarItem(); - statusBarItemEl.setText("This is made for love"); - - this.addCommand({ - id: "share-to-notion", - name: "share to notion", - editorCallback: async (editor: Editor, view: MarkdownView) => { - console.log(view.data); - }, - }); - - // This adds a simple command that can be triggered anywhere - this.addCommand({ - id: "open-sample-modal-simple", - name: "Open sample modal (simple)", - callback: () => { - new SampleModal(this.app).open(); - }, - }); - // This adds an editor command that can perform some operation on the current editor instance - this.addCommand({ - id: "sample-editor-command", - name: "Sample editor command", - editorCallback: (editor: Editor, view: MarkdownView) => { - console.log(editor.getSelection()); - editor.replaceSelection("Sample Editor Command"); - }, - }); - // This adds a complex command that can check whether the current state of the app allows execution of the command - this.addCommand({ - id: "open-sample-modal-complex", - name: "Open sample modal (complex)", - checkCallback: (checking: boolean) => { - // Conditions to check - const markdownView = - this.app.workspace.getActiveViewOfType(MarkdownView); - if (markdownView) { - // If checking is true, we're simply "checking" if the command can be run. - // If checking is false, then we want to actually perform the operation. - if (!checking) { - new SampleModal(this.app).open(); - } - - // This command will only show up in Command Palette when the check function returns true - return true; - } - }, - }); - - // This adds a settings tab so the user can configure various aspects of the plugin - this.addSettingTab(new SampleSettingTab(this.app, this)); - - // If the plugin hooks up any global DOM events (on parts of the app that doesn't belong to this plugin) - // Using this function will automatically remove the event listener when this plugin is disabled. - this.registerDomEvent(document, "click", (evt: MouseEvent) => { - // console.log("click", evt); - }); - - // When registering intervals, this function will automatically clear the interval when the plugin is disabled. - this.registerInterval( - window.setInterval(() => console.log("setInterval"), 5 * 60 * 1000) - ); } - onunload() {} - async getNowFileMarkdwonContent(app: App) { const nowFile = app.workspace.getActiveFile(); if (nowFile) { @@ -227,18 +188,5 @@ class SampleSettingTab extends PluginSettingTab { }) ); - new Setting(containerEl) - .setName("Proxy") - .setDesc("like `http:127.0.0.1:8888`") - .addText((text) => - text - .setPlaceholder("Enter proxy config defalut is null") - .setValue(this.plugin.settings.proxy) - .onChange(async (value) => { - console.log("Secret: " + value); - this.plugin.settings.proxy = value; - await this.plugin.saveSettings(); - }) - ); } }