reformat code and update readme file

src/commands/FuzzySuggester.ts

@@ -11,7 +11,7 @@ export interface DatabaseList {
 }
 
 
-export class FuzzySuggester extends FuzzySuggestModal<DatabaseList>{
+export class FuzzySuggester extends FuzzySuggestModal<DatabaseList> {
     private plugin: MyPlugin;
     private data: DatabaseList[];
     private callback: any;

src/commands/NotionCommands.ts

@@ -1,9 +1,9 @@
 import { i18nConfig } from "src/lang/I18n";
-import {Editor, MarkdownView, setTooltip} from "obsidian";
+import { Editor, MarkdownView, setTooltip } from "obsidian";
 import { FuzzySuggester, DatabaseList } from "./FuzzySuggester";
-import {uploadCommandCustom, uploadCommandGeneral, uploadCommandNext} from "../upload/uploadCommand";
+import { uploadCommandCustom, uploadCommandGeneral, uploadCommandNext } from "../upload/uploadCommand";
 import ObsidianSyncNotionPlugin from "src/main";
-import {DatabaseDetails} from "../ui/settingTabs";
+import { DatabaseDetails } from "../ui/settingTabs";
 
 
 interface Command {

src/main.ts

@@ -55,33 +55,33 @@ export default class ObsidianSyncNotionPlugin extends Plugin {
         await this.saveData(this.settings);
     }
 
-	async addDatabaseDetails(dbDetails: DatabaseDetails) {
-		this.settings.databaseDetails = {
-			...this.settings.databaseDetails,
-			[dbDetails.abName]: dbDetails,
-		};
+    async addDatabaseDetails(dbDetails: DatabaseDetails) {
+        this.settings.databaseDetails = {
+            ...this.settings.databaseDetails,
+            [dbDetails.abName]: dbDetails,
+        };
 
-		await this.saveSettings();
-	}
+        await this.saveSettings();
+    }
 
-	async deleteDatabaseDetails(dbDetails: DatabaseDetails) {
-		delete this.settings.databaseDetails[dbDetails.abName];
+    async deleteDatabaseDetails(dbDetails: DatabaseDetails) {
+        delete this.settings.databaseDetails[dbDetails.abName];
 
-		await this.saveSettings();
-	}
+        await this.saveSettings();
+    }
 
-	async updateDatabaseDetails(dbDetails: DatabaseDetails) {
-		// delete the old database details
-		delete this.settings.databaseDetails[dbDetails.abName];
+    async updateDatabaseDetails(dbDetails: DatabaseDetails) {
+        // delete the old database details
+        delete this.settings.databaseDetails[dbDetails.abName];
 
-		this.settings.databaseDetails = {
-			...this.settings.databaseDetails,
-			[dbDetails.abName]: dbDetails,
-		};
+        this.settings.databaseDetails = {
+            ...this.settings.databaseDetails,
+            [dbDetails.abName]: dbDetails,
+        };
+
+        await this.saveSettings();
+    }
 
-		await this.saveSettings();
-	}
-	
 }
 
 

src/ui/DeleteModal.ts

@@ -1,5 +1,5 @@
-import {App, ButtonComponent, Modal, Setting} from "obsidian";
-import {DatabaseDetails, ObsidianSettingTab} from "./settingTabs";
+import { App, ButtonComponent, Modal, Setting } from "obsidian";
+import { DatabaseDetails, ObsidianSettingTab } from "./settingTabs";
 import ObsidianSyncNotionPlugin from "../main";
 
 export class DeleteModal extends Modal {
@@ -21,12 +21,12 @@ export class DeleteModal extends Modal {
 		this.containerEl.addClass("delete-modal");
 		this.titleEl.setText('Delete Database');
 
-		let {contentEl} = this;
+		let { contentEl } = this;
 		contentEl.empty();
 
 		const deleteDiv = contentEl.createDiv('delete-div');
-		deleteDiv.createEl('h4', {text: 'Are you sure you want to delete the following database?'});
-		deleteDiv.createEl('h2', {text: this.dbDetails.fullName + ' (' + this.dbDetails.abName + ', ' + this.dbDetails.format +')'});
+		deleteDiv.createEl('h4', { text: 'Are you sure you want to delete the following database?' });
+		deleteDiv.createEl('h2', { text: this.dbDetails.fullName + ' (' + this.dbDetails.abName + ', ' + this.dbDetails.format + ')' });
 
 
 		// add delete button

src/ui/EditModal.ts

@@ -1,4 +1,4 @@
-import { App, ButtonComponent, Modal, Setting } from "obsidian";
+import { App, ButtonComponent, Setting } from "obsidian";
 import { customProperty, SettingModal } from "./settingModal";
 import ObsidianSyncNotionPlugin from "../main";
 import { DatabaseDetails, ObsidianSettingTab } from "./settingTabs";
@@ -133,8 +133,8 @@ export class EditModal extends SettingModal {
 				.onClick(async () => {
 					this.dataTemp.savedTempInd = true;
 					this.dataTemp.savedTemp = true;
-					console.log(this.dataTemp);
-					console.log(this.dataPrev);
+					// console.log(this.dataTemp);
+					// console.log(this.dataPrev);
 					this.close();
 				});
 		}
@@ -144,8 +144,8 @@ export class EditModal extends SettingModal {
 				.setTooltip('Cancel')
 				.setIcon('cross')
 				.onClick(() => {
-					console.log(this.dataTemp);
-					console.log(this.dataPrev);
+					// console.log(this.dataTemp);
+					// console.log(this.dataPrev);
 					this.close();
 				});
 		}

src/ui/PreviewModal.ts

@@ -1,15 +1,15 @@
-import {App, ExtraButtonComponent, Modal, Notice, Setting} from "obsidian";
+import { App, ExtraButtonComponent, Modal, Notice, Setting } from "obsidian";
 import ObsidianSyncNotionPlugin from "../main";
-import {DatabaseDetails, ObsidianSettingTab} from "./settingTabs";
-import {customProperty} from "./settingModal";
-import {i18nConfig} from "../lang/I18n";
+import { DatabaseDetails, ObsidianSettingTab } from "./settingTabs";
+import { customProperty } from "./settingModal";
+import { i18nConfig } from "../lang/I18n";
 
 export class PreviewModal extends Modal {
 	plugin: ObsidianSyncNotionPlugin;
 	settingTab: ObsidianSettingTab;
 	dbDetails: DatabaseDetails;
 
-	constructor(app:App, plugin: ObsidianSyncNotionPlugin, settingTab: ObsidianSettingTab, dbDetails: DatabaseDetails) {
+	constructor(app: App, plugin: ObsidianSyncNotionPlugin, settingTab: ObsidianSettingTab, dbDetails: DatabaseDetails) {
 		super(app);
 		this.plugin = plugin;
 		this.settingTab = settingTab;
@@ -26,25 +26,25 @@ export class PreviewModal extends Modal {
 		const previewEl = contentEl.createDiv('preview-content')
 
 		const dbFormatEl = new Setting(previewEl)
-			dbFormatEl
+		dbFormatEl
 			.setName('Database Format')
-				.addText(text => text
-					.setValue(this.dbDetails.format)
-					.setDisabled(true));
+			.addText(text => text
+				.setValue(this.dbDetails.format)
+				.setDisabled(true));
 
 		const dbFullEl = new Setting(previewEl)
-			dbFullEl
+		dbFullEl
 			.setName('Database Full Name')
-				.addText(text => text
-					.setValue(this.dbDetails.fullName)
-					.setDisabled(true));
+			.addText(text => text
+				.setValue(this.dbDetails.fullName)
+				.setDisabled(true));
 
 		const dbAbbrEl = new Setting(previewEl)
-			dbAbbrEl
+		dbAbbrEl
 			.setName('Database Abbreviate Name')
-				.addText(text => text
-					.setValue(this.dbDetails.abName)
-					.setDisabled(true));
+			.addText(text => text
+				.setValue(this.dbDetails.abName)
+				.setDisabled(true));
 		// .controlEl.createEl('p', { text: this.dbDetails.abName })
 
 		// Setting for toggle and copy buttons
@@ -124,7 +124,6 @@ export class PreviewModal extends Modal {
 
 			const customPrv = previewEl.createDiv("custom-tabs");
 
-
 			this.previewPropertyLine(previewEl, this.dbDetails.customProperties);
 		}
 

src/ui/settingTabs.ts

@@ -1,31 +1,29 @@
-import {App, ButtonComponent, Modal, PluginSettingTab, Setting} from "obsidian";
-import {i18nConfig} from "../lang/I18n";
+import { App, ButtonComponent, PluginSettingTab, Setting } from "obsidian";
+import { i18nConfig } from "../lang/I18n";
 import ObsidianSyncNotionPlugin from "../main";
-import {SettingModal} from "./settingModal";
-import {set} from "yaml/dist/schema/yaml-1.1/set";
-import {PreviewModal} from "./PreviewModal";
-import {EditModal} from "./EditModal";
-import {DeleteModal} from "./DeleteModal";
+import { SettingModal } from "./settingModal";
+import { PreviewModal } from "./PreviewModal";
+import { EditModal } from "./EditModal";
+import { DeleteModal } from "./DeleteModal";
 
 export interface PluginSettings {
-    NextButton: boolean;
-    notionAPINext: string;
-    databaseIDNext: string;
-    bannerUrl: string;
-    notionUser: string;
-	NotionLinkDisplay: boolean;
-    proxy: string;
-    GeneralButton: boolean;
-    tagButton: boolean;
-    customTitleButton: boolean;
-    customTitleName: string;
-    notionAPIGeneral: string;
-    databaseIDGeneral: string;
-    CustomButton: boolean;
-    CustomValues: string;
-    notionAPICustom: string;
-    databaseIDCustom: string;
-    [key: string]: any;
+	NextButton: boolean;
+	notionAPINext: string;
+	databaseIDNext: string;
+	bannerUrl: string;
+	notionUser: string;
+	proxy: string;
+	GeneralButton: boolean;
+	tagButton: boolean;
+	customTitleButton: boolean;
+	customTitleName: string;
+	notionAPIGeneral: string;
+	databaseIDGeneral: string;
+	CustomButton: boolean;
+	CustomValues: string;
+	notionAPICustom: string;
+	databaseIDCustom: string;
+	[key: string]: any;
 	databaseDetails: Record<string, DatabaseDetails>
 }
 
@@ -38,58 +36,54 @@ export interface DatabaseDetails {
 	tagButton: boolean;
 	customTitleButton: boolean;
 	customTitleName: string;
-	customProperties:{ customName: string, customType: string, index: number}[];
+	customProperties: { customName: string, customType: string, index: number }[];
 	// customValues: string;
 	saved: boolean;
 }
 
 export const DEFAULT_SETTINGS: PluginSettings = {
-    NextButton: true,
-    notionAPINext: "",
-    databaseIDNext: "",
-    bannerUrl: "",
-    notionUser: "",
-	NotionLinkDisplay: true,
-    proxy: "",
-    GeneralButton: true,
-    tagButton: true,
-    customTitleButton: false,
-    customTitleName: "",
-    notionAPIGeneral: "",
-    databaseIDGeneral: "",
-    CustomButton: false,
-    CustomValues: "",
-    notionAPICustom: "",
-    databaseIDCustom: "",
+	NextButton: true,
+	notionAPINext: "",
+	databaseIDNext: "",
+	bannerUrl: "",
+	notionUser: "",
+	proxy: "",
+	GeneralButton: true,
+	tagButton: true,
+	customTitleButton: false,
+	customTitleName: "",
+	notionAPIGeneral: "",
+	databaseIDGeneral: "",
+	CustomButton: false,
+	CustomValues: "",
+	notionAPICustom: "",
+	databaseIDCustom: "",
 	databaseDetails: {},
 };
 
 
 export class ObsidianSettingTab extends PluginSettingTab {
-    plugin: ObsidianSyncNotionPlugin;
+	plugin: ObsidianSyncNotionPlugin;
 	databaseEl: HTMLDivElement;
 
-    constructor(app: App, plugin: ObsidianSyncNotionPlugin) {
-        super(app, plugin);
-        this.plugin = plugin;
-    }
+	constructor(app: App, plugin: ObsidianSyncNotionPlugin) {
+		super(app, plugin);
+		this.plugin = plugin;
+	}
 
-    display(): void {
-        const { containerEl } = this;
+	display(): void {
+		const { containerEl } = this;
 
-        containerEl.empty();
+		containerEl.empty();
 
-        // General Settings
-        containerEl.createEl('h2', { text: i18nConfig.GeneralSetting });
+		// General Settings
+		containerEl.createEl('h2', { text: i18nConfig.GeneralSetting });
 
-        this.createSettingEl(containerEl, i18nConfig.BannerUrl, i18nConfig.BannerUrlDesc, 'text', i18nConfig.BannerUrlText, this.plugin.settings.bannerUrl, 'bannerUrl')
+		this.createSettingEl(containerEl, i18nConfig.BannerUrl, i18nConfig.BannerUrlDesc, 'text', i18nConfig.BannerUrlText, this.plugin.settings.bannerUrl, 'bannerUrl')
 
-        this.createSettingEl(containerEl, i18nConfig.NotionUser, i18nConfig.NotionUserDesc, 'text', i18nConfig.NotionUserText, this.plugin.settings.notionUser, 'notionUser')
-
-		this.createSettingEl(containerEl, i18nConfig.NotionLinkDisplay, i18nConfig.NotionLinkDisplayDesc, 'toggle', i18nConfig.NotionLinkDisplay, this.plugin.settings.NotionLinkDisplay, 'NotionLinkDisplay')
+		this.createSettingEl(containerEl, i18nConfig.NotionUser, i18nConfig.NotionUserDesc, 'text', i18nConfig.NotionUserText, this.plugin.settings.notionUser, 'notionUser')
 
 		// add new button
-
 		new Setting(containerEl)
 			.setName("Add New Database")
 			.setDesc("Add New Database")
@@ -129,73 +123,74 @@ export class ObsidianSettingTab extends PluginSettingTab {
 			});
 
 		// new section to display all created database
-		containerEl.createEl('h2', {text: "Database List"});
+		containerEl.createEl('h2', { text: "Database List" });
 
 		this.databaseEl = containerEl.createDiv('database-list');
 		// list all created database
 		this.showDatabase();
 
-    }
+	}
 
-    // create a function to create a div with a style for pop over elements
-    public createStyleDiv(className: string, commandValue: boolean = false) {
-        return this.containerEl.createDiv(className, (div) => {
-            this.updateSettingEl(div, commandValue);
-        });
-    }
-    // update the setting display style in the setting tab
-    public updateSettingEl(element: HTMLElement, commandValue: boolean) {
-        element.style.borderTop = commandValue ? "1px solid var(--background-modifier-border)" : "none";
-        element.style.paddingTop = commandValue ? "0.75em" : "0";
-        element.style.display = commandValue ? "block" : "none";
-        element.style.alignItems = "center";
-    }
+	// create a function to create a div with a style for pop over elements
+	// public createStyleDiv(className: string, commandValue: boolean = false) {
+	//     return this.containerEl.createDiv(className, (div) => {
+	//         this.updateSettingEl(div, commandValue);
+	//     });
+	// }
 
-    // function to add one setting element in the setting tab.
-    public createSettingEl(containerEl: HTMLElement, name: string, desc: string, type: string, placeholder: string, holderValue: any, settingsKey: string) {
-        if (type === 'password') {
-            return new Setting(containerEl)
-                .setName(name)
-                .setDesc(desc)
-                .addText((text) => {
-                    text.inputEl.type = type;
-                    return text
-                        .setPlaceholder(placeholder)
-                        .setValue(holderValue)
-                        .onChange(async (value) => {
-                            this.plugin.settings[settingsKey] = value; // Update the plugin settings directly
-                            await this.plugin.saveSettings();
-                        })
-                });
-        } else if (type === 'toggle') {
-            return new Setting(containerEl)
-                .setName(name)
-                .setDesc(desc)
-                .addToggle((toggle) =>
-                    toggle
-                        .setValue(holderValue)
-                        .onChange(async (value) => {
-                            this.plugin.settings[settingsKey] = value; // Update the plugin settings directly
-                            await this.plugin.saveSettings();
-                            await this.plugin.commands.updateCommand();
-                        })
-                );
-        } else if (type === 'text') {
-            return new Setting(containerEl)
-                .setName(name)
-                .setDesc(desc)
-                .addText((text) =>
-                    text
-                        .setPlaceholder(placeholder)
-                        .setValue(holderValue)
-                        .onChange(async (value) => {
-                            this.plugin.settings[settingsKey] = value; // Update the plugin settings directly
-                            await this.plugin.saveSettings();
-                            await this.plugin.commands.updateCommand();
-                        })
-                );
-        }
-    }
+	// update the setting display style in the setting tab
+	public updateSettingEl(element: HTMLElement, commandValue: boolean) {
+		element.style.borderTop = commandValue ? "1px solid var(--background-modifier-border)" : "none";
+		element.style.paddingTop = commandValue ? "0.75em" : "0";
+		element.style.display = commandValue ? "block" : "none";
+		element.style.alignItems = "center";
+	}
+
+	// function to add one setting element in the setting tab.
+	public createSettingEl(containerEl: HTMLElement, name: string, desc: string, type: string, placeholder: string, holderValue: any, settingsKey: string) {
+		if (type === 'password') {
+			return new Setting(containerEl)
+				.setName(name)
+				.setDesc(desc)
+				.addText((text) => {
+					text.inputEl.type = type;
+					return text
+						.setPlaceholder(placeholder)
+						.setValue(holderValue)
+						.onChange(async (value) => {
+							this.plugin.settings[settingsKey] = value; // Update the plugin settings directly
+							await this.plugin.saveSettings();
+						})
+				});
+		} else if (type === 'toggle') {
+			return new Setting(containerEl)
+				.setName(name)
+				.setDesc(desc)
+				.addToggle((toggle) =>
+					toggle
+						.setValue(holderValue)
+						.onChange(async (value) => {
+							this.plugin.settings[settingsKey] = value; // Update the plugin settings directly
+							await this.plugin.saveSettings();
+							await this.plugin.commands.updateCommand();
+						})
+				);
+		} else if (type === 'text') {
+			return new Setting(containerEl)
+				.setName(name)
+				.setDesc(desc)
+				.addText((text) =>
+					text
+						.setPlaceholder(placeholder)
+						.setValue(holderValue)
+						.onChange(async (value) => {
+							this.plugin.settings[settingsKey] = value; // Update the plugin settings directly
+							await this.plugin.saveSettings();
+							await this.plugin.commands.updateCommand();
+						})
+				);
+		}
+	}
 
 	// function to show all the database details
 	showDatabase() {
@@ -211,8 +206,8 @@ export class ObsidianSettingTab extends PluginSettingTab {
 				.setDesc(dbDetails.format)
 
 
-				// add a button for preview data
-				settingEl
+			// add a button for preview data
+			settingEl
 				.addButton((button: ButtonComponent): ButtonComponent => {
 					return button
 						.setTooltip("Preview Database")
@@ -224,8 +219,8 @@ export class ObsidianSettingTab extends PluginSettingTab {
 						});
 				});
 
-				// add a button for edit data
-				settingEl
+			// add a button for edit data
+			settingEl
 				.addButton((button: ButtonComponent): ButtonComponent => {
 					return button
 						.setTooltip("Edit Database")
@@ -272,11 +267,11 @@ export class ObsidianSettingTab extends PluginSettingTab {
 								}
 							}
 
-							modal.open ();
+							modal.open();
 						});
 				});
 
-				settingEl
+			settingEl
 				.addButton((button: ButtonComponent): ButtonComponent => {
 					return button
 						.setTooltip("Delete Database")

src/upload/updateYaml.ts

@@ -1,6 +1,6 @@
 import { App, Notice, TFile } from "obsidian";
 import ObsidianSyncNotionPlugin from "../main";
-import {DatabaseDetails} from "../ui/settingTabs";
+import { DatabaseDetails } from "../ui/settingTabs";
 
 export async function updateYamlInfo(
     yamlContent: string,
@@ -8,14 +8,14 @@ export async function updateYamlInfo(
     res: any,
     app: App,
     plugin: ObsidianSyncNotionPlugin,
-	dbDetails: DatabaseDetails,
+    dbDetails: DatabaseDetails,
 ) {
     let { url, id } = res.json
     // replace www to notionID
     const { notionUser } = plugin.settings;
-	const { abName } = dbDetails
-	const notionIDKey = `NotionID-${abName}`;
-	const linkKey = `link-${abName}`;
+    const { abName } = dbDetails
+    const notionIDKey = `NotionID-${abName}`;
+    const linkKey = `link-${abName}`;
 
     if (notionUser !== "") {
         // replace url str "www" to notionID

src/upload/uploadCommand.ts

@@ -1,13 +1,13 @@
-import {i18nConfig} from "../lang/I18n";
-import {App, Notice} from "obsidian";
-import {Upload2NotionNext} from "./upload_next/Upload2NotionNext";
-import {Upload2NotionGeneral} from "./upload_general/Upload2NotionGeneral";
-import {Upload2NotionCustom} from "./upoload_custom/Upload2NotionCustom";
-import {DatabaseDetails, PluginSettings} from "../ui/settingTabs";
+import { i18nConfig } from "../lang/I18n";
+import { App, Notice } from "obsidian";
+import { Upload2NotionNext } from "./upload_next/Upload2NotionNext";
+import { Upload2NotionGeneral } from "./upload_general/Upload2NotionGeneral";
+import { Upload2NotionCustom } from "./upoload_custom/Upload2NotionCustom";
+import { DatabaseDetails, PluginSettings } from "../ui/settingTabs";
 import ObsidianSyncNotionPlugin from "../main";
-import {getNowFileMarkdownContentNext} from "./upload_next/getMarkdownNext";
-import {getNowFileMarkdownContentGeneral} from "./upload_general/getMarkdownGeneral";
-import {getNowFileMarkdownContentCustom} from "./upoload_custom/getMarkdownCustom";
+import { getNowFileMarkdownContentNext } from "./upload_next/getMarkdownNext";
+import { getNowFileMarkdownContentGeneral } from "./upload_general/getMarkdownGeneral";
+import { getNowFileMarkdownContentCustom } from "./upoload_custom/getMarkdownCustom";
 
 export async function uploadCommandNext(
 	plugin: ObsidianSyncNotionPlugin,
@@ -16,7 +16,7 @@ export async function uploadCommandNext(
 	app: App,
 ) {
 
-	const {notionAPI, databaseID} = dbDetails;
+	const { notionAPI, databaseID } = dbDetails;
 
 	// Check if NNon exists
 	// if (NNon === undefined) {
@@ -49,7 +49,7 @@ export async function uploadCommandNext(
 	} = await getNowFileMarkdownContentNext(app, settings)
 
 	if (markDownData) {
-		const {basename} = nowFile;
+		const { basename } = nowFile;
 		const upload = new Upload2NotionNext(plugin, dbDetails);
 		const res = await upload.syncMarkdownToNotionNext(basename, emoji, cover, tags, type, slug, stats, category, summary, paword, favicon, datetime, markDownData, nowFile, this.app);
 
@@ -70,7 +70,7 @@ export async function uploadCommandGeneral(
 	app: App,
 ) {
 
-	const {notionAPI, databaseID} = dbDetails;
+	const { notionAPI, databaseID } = dbDetails;
 
 	// Check if the user has set up the Notion API and database ID
 	if (notionAPI === "" || databaseID === "") {
@@ -79,10 +79,10 @@ export async function uploadCommandGeneral(
 		return;
 	}
 
-	const {markDownData, nowFile, cover, tags} = await getNowFileMarkdownContentGeneral(app, settings)
+	const { markDownData, nowFile, cover, tags } = await getNowFileMarkdownContentGeneral(app, settings)
 
 	if (markDownData) {
-		const {basename} = nowFile;
+		const { basename } = nowFile;
 
 		const upload = new Upload2NotionGeneral(plugin, dbDetails);
 		const res = await upload.syncMarkdownToNotionGeneral(basename, cover, tags, markDownData, nowFile, this.app);
@@ -104,7 +104,7 @@ export async function uploadCommandCustom(
 	app: App,
 ) {
 
-	const {notionAPI, databaseID} = settings;
+	const { notionAPI, databaseID } = settings;
 
 	// Check if the user has set up the Notion API and database ID
 	if (notionAPI === "" || databaseID === "") {
@@ -113,10 +113,10 @@ export async function uploadCommandCustom(
 		return;
 	}
 
-	const {markDownData, nowFile, cover, customValues} = await getNowFileMarkdownContentCustom(app, dbDetails)
+	const { markDownData, nowFile, cover, customValues } = await getNowFileMarkdownContentCustom(app, dbDetails)
 
 	if (markDownData) {
-		const { basename} = nowFile;
+		const { basename } = nowFile;
 
 		const upload = new Upload2NotionCustom(plugin, dbDetails);
 		const res = await upload.syncMarkdownToNotionCustom(cover, customValues, markDownData, nowFile, this.app);

src/upload/upload_general/BaseUpload2NotionGeneral.ts

@@ -1,10 +1,10 @@
-import {App, Notice, requestUrl, TFile} from "obsidian";
-import {Client} from '@notionhq/client';
-import {markdownToBlocks,} from "@tryfabric/martian";
+import { App, Notice, requestUrl, TFile } from "obsidian";
+import { Client } from '@notionhq/client';
+import { markdownToBlocks, } from "@tryfabric/martian";
 import * as yamlFrontMatter from "yaml-front-matter";
 // import * as yaml from "yaml"
 import MyPlugin from "src/main";
-import {DatabaseDetails} from "../../ui/settingTabs";
+import { DatabaseDetails } from "../../ui/settingTabs";
 
 export class UploadBaseGeneral {
 	plugin: MyPlugin;
@@ -19,7 +19,7 @@ export class UploadBaseGeneral {
 
 	async deletePage(notionID: string) {
 
-		const {notionAPI} = this.dbDetails
+		const { notionAPI } = this.dbDetails
 		return requestUrl({
 			url: `https://api.notion.com/v1/blocks/${notionID}`,
 			method: 'DELETE',
@@ -33,15 +33,15 @@ export class UploadBaseGeneral {
 	}
 
 	async getDataBase(databaseID: string) {
-		const {notionAPI} = this.dbDetails
+		const { notionAPI } = this.dbDetails
 		const response = await requestUrl({
-				url: `https://api.notion.com/v1/databases/${databaseID}`,
-				method: 'GET',
-				headers: {
-					'Authorization': 'Bearer ' + notionAPI,
-					'Notion-Version': '2022-06-28',
-				}
+			url: `https://api.notion.com/v1/databases/${databaseID}`,
+			method: 'GET',
+			headers: {
+				'Authorization': 'Bearer ' + notionAPI,
+				'Notion-Version': '2022-06-28',
 			}
+		}
 		)
 
 		// Check if cover is present in the JSON response and then get the URL

src/upload/upload_general/Upload2NotionGeneral.ts

@@ -4,7 +4,7 @@ import { markdownToBlocks } from "@tryfabric/martian";
 import * as yamlFrontMatter from "yaml-front-matter";
 // import * as yaml from "yaml"
 import MyPlugin from "src/main";
-import {DatabaseDetails, PluginSettings} from "../../ui/settingTabs";
+import { DatabaseDetails, PluginSettings } from "../../ui/settingTabs";
 import { UploadBaseGeneral } from "./BaseUpload2NotionGeneral";
 import { updateYamlInfo } from "../updateYaml";
 
@@ -138,7 +138,7 @@ export class Upload2NotionGeneral extends UploadBaseGeneral {
 		const file2Block = markdownToBlocks(__content, options);
 		const frontmasster =
 			app.metadataCache.getFileCache(nowFile)?.frontmatter;
-		const {abName} = this.dbDetails
+		const { abName } = this.dbDetails
 		const notionIDKey = `NotionID-${abName}`;
 		const notionID = frontmasster ? frontmasster[notionIDKey] : null;
 

src/upload/upload_general/getMarkdownGeneral.ts

@@ -1,6 +1,6 @@
-import {App, Notice} from "obsidian";
-import {i18nConfig} from "../../lang/I18n";
-import {PluginSettings} from "../../ui/settingTabs";
+import { App, Notice } from "obsidian";
+import { i18nConfig } from "../../lang/I18n";
+import { PluginSettings } from "../../ui/settingTabs";
 
 export async function getNowFileMarkdownContentGeneral(
 	app: App,

src/upload/upload_next/BaseUpload2NotionNext.ts

@@ -4,21 +4,21 @@ import { markdownToBlocks, } from "@tryfabric/martian";
 import * as yamlFrontMatter from "yaml-front-matter";
 // import * as yaml from "yaml"
 import MyPlugin from "src/main";
-import {DatabaseDetails} from "../../ui/settingTabs";
+import { DatabaseDetails } from "../../ui/settingTabs";
 
 export class UploadBaseNext {
     plugin: MyPlugin;
     notion: Client;
     agent: any;
-	dbDetails: DatabaseDetails
+    dbDetails: DatabaseDetails
 
     constructor(plugin: MyPlugin, dbDetails: DatabaseDetails) {
         this.plugin = plugin;
-		this.dbDetails = dbDetails
+        this.dbDetails = dbDetails
     }
 
     async deletePage(notionID: string) {
-		const {notionAPI} = this.dbDetails
+        const { notionAPI } = this.dbDetails
         return requestUrl({
             url: `https://api.notion.com/v1/blocks/${notionID}`,
             method: 'DELETE',
@@ -32,7 +32,7 @@ export class UploadBaseNext {
     }
 
     async getDataBase(databaseID: string) {
-		const {notionAPI} = this.dbDetails
+        const { notionAPI } = this.dbDetails
 
         const response = await requestUrl({
             url: `https://api.notion.com/v1/databases/${databaseID}`,

src/upload/upload_next/Upload2NotionNext.ts

@@ -5,17 +5,17 @@ import { markdownToBlocks, } from "@tryfabric/martian";
 import * as yamlFrontMatter from "yaml-front-matter";
 // import * as yaml from "yaml"
 import MyPlugin from "src/main";
-import {DatabaseDetails, PluginSettings} from "../../ui/settingTabs";
+import { DatabaseDetails, PluginSettings } from "../../ui/settingTabs";
 import { updateYamlInfo } from "../updateYaml";
-import {LIMITS, paragraph} from "@tryfabric/martian/src/notion";
+import { LIMITS, paragraph } from "@tryfabric/martian/src/notion";
 
 export class Upload2NotionNext extends UploadBaseNext {
     settings: PluginSettings;
-	dbDetails: DatabaseDetails
+    dbDetails: DatabaseDetails
 
     constructor(plugin: MyPlugin, dbDetails: DatabaseDetails) {
         super(plugin, dbDetails);
-		this.dbDetails = dbDetails
+        this.dbDetails = dbDetails
     }
 
     // 因为需要解析notion的block进行对比，非常的麻烦，
@@ -38,7 +38,7 @@ export class Upload2NotionNext extends UploadBaseNext {
     ) {
         await this.deletePage(notionID)
 
-		const { databaseID} = this.dbDetails
+        const { databaseID } = this.dbDetails
 
         const databaseCover = await this.getDataBase(databaseID)
 
@@ -78,10 +78,10 @@ export class Upload2NotionNext extends UploadBaseNext {
         childArr: any
     ) {
 
-		const {
-			databaseID,
-			notionAPI
-		} = this.dbDetails
+        const {
+            databaseID,
+            notionAPI
+        } = this.dbDetails
 
 
         const bodyString: any = {
@@ -141,47 +141,47 @@ export class Upload2NotionNext extends UploadBaseNext {
             children: childArr,
         }
 
-		// add tags
-		if (tags) {
-			bodyString.properties.tags = {
-				multi_select: tags.map(tag => {
-					return { "name": tag }
-				})
-			}
-		}
+        // add tags
+        if (tags) {
+            bodyString.properties.tags = {
+                multi_select: tags.map(tag => {
+                    return { "name": tag }
+                })
+            }
+        }
 
-		// add title icon
-		if (emoji) {
-				bodyString.icon = {
-					emoji: emoji
-				}
-		}
+        // add title icon
+        if (emoji) {
+            bodyString.icon = {
+                emoji: emoji
+            }
+        }
 
-		// add slug
-		if (slug) {
-			bodyString.properties.slug = {
-				rich_text: [
-					{
-						text: {
-							content: slug
-						}
-					}
-				]
-			}
-		}
+        // add slug
+        if (slug) {
+            bodyString.properties.slug = {
+                rich_text: [
+                    {
+                        text: {
+                            content: slug
+                        }
+                    }
+                ]
+            }
+        }
 
-		// check if summary is available
-		if (summary) {
-			bodyString.properties.summary = {
-				rich_text: [
-					{
-						text: {
-							content: summary
-						}
-					}
-				]
-			}
-		}
+        // check if summary is available
+        if (summary) {
+            bodyString.properties.summary = {
+                rich_text: [
+                    {
+                        text: {
+                            content: summary
+                        }
+                    }
+                ]
+            }
+        }
 
 
 
@@ -238,41 +238,41 @@ export class Upload2NotionNext extends UploadBaseNext {
         nowFile: TFile,
         app: App,
     ): Promise<any> {
-		const options = {
-			notionLimits: {
-				truncate: false,
-			}
-		}
+        const options = {
+            notionLimits: {
+                truncate: false,
+            }
+        }
         let res: any
         const yamlContent: any = yamlFrontMatter.loadFront(markdown);
         const __content = yamlContent.__content
         const file2Block = markdownToBlocks(__content, options);
         const frontmasster = app.metadataCache.getFileCache(nowFile)?.frontmatter
-		const {abName} = this.dbDetails
-		const notionIDKey = `NotionID-${abName}`;
-		const notionID = frontmasster ? frontmasster[notionIDKey] : null;
+        const { abName } = this.dbDetails
+        const notionIDKey = `NotionID-${abName}`;
+        const notionID = frontmasster ? frontmasster[notionIDKey] : null;
 
 
-		// increase the limits
-		// Motivated by https://github.com/tryfabric/martian/issues/51
-		file2Block.forEach((block,index) => {
-			if (
-				block.type === 'paragraph' &&
-				block.paragraph.rich_text.length > LIMITS.RICH_TEXT_ARRAYS
-			) {
+        // increase the limits
+        // Motivated by https://github.com/tryfabric/martian/issues/51
+        file2Block.forEach((block, index) => {
+            if (
+                block.type === 'paragraph' &&
+                block.paragraph.rich_text.length > LIMITS.RICH_TEXT_ARRAYS
+            ) {
 
-				const newParagraphBlocks: any[] = []
-				const chunk:any = []
-				const richTextChunks = chunk(block.paragraph.rich_text, 100)
+                const newParagraphBlocks: any[] = []
+                const chunk: any = []
+                const richTextChunks = chunk(block.paragraph.rich_text, 100)
 
-				richTextChunks.forEach((chunk: any) => {
-					newParagraphBlocks.push(paragraph(chunk))
-				})
+                richTextChunks.forEach((chunk: any) => {
+                    newParagraphBlocks.push(paragraph(chunk))
+                })
 
-				file2Block.splice(index, 1, ...newParagraphBlocks)
+                file2Block.splice(index, 1, ...newParagraphBlocks)
 
-			}
-		})
+            }
+        })
 
         if (notionID) {
             res = await this.updatePage(

src/upload/upload_next/getMarkdownNext.ts

@@ -13,7 +13,7 @@ export async function getNowFileMarkdownContentNext(
     let type = '';
     let slug = '';
     let stats = '';
-	let status = '';
+    let status = '';
     let category = '';
     let summary = '';
     let paword = '';

src/upload/upoload_custom/BaseUpload2NotionCustom.ts

@@ -1,24 +1,24 @@
-import {App, Notice, requestUrl, TFile} from "obsidian";
-import {Client} from '@notionhq/client';
-import {markdownToBlocks,} from "@tryfabric/martian";
+import { App, Notice, requestUrl, TFile } from "obsidian";
+import { Client } from '@notionhq/client';
+import { markdownToBlocks, } from "@tryfabric/martian";
 import * as yamlFrontMatter from "yaml-front-matter";
 // import * as yaml from "yaml"
 import MyPlugin from "src/main";
-import {DatabaseDetails} from "../../ui/settingTabs";
+import { DatabaseDetails } from "../../ui/settingTabs";
 
 export class UploadBaseCustom {
     plugin: MyPlugin;
     notion: Client;
     agent: any;
-	dbDetails: DatabaseDetails
+    dbDetails: DatabaseDetails
 
     constructor(plugin: MyPlugin, dbDetails: DatabaseDetails) {
         this.plugin = plugin;
-		this.dbDetails = dbDetails
+        this.dbDetails = dbDetails
     }
 
     async deletePage(notionID: string) {
-		const {notionAPI} = this.dbDetails
+        const { notionAPI } = this.dbDetails
         return requestUrl({
             url: `https://api.notion.com/v1/blocks/${notionID}`,
             method: 'DELETE',
@@ -32,15 +32,15 @@ export class UploadBaseCustom {
     }
 
     async getDataBase(databaseID: string) {
-		const {notionAPI} = this.dbDetails
+        const { notionAPI } = this.dbDetails
         const response = await requestUrl({
-                url: `https://api.notion.com/v1/databases/${databaseID}`,
-                method: 'GET',
-                headers: {
-                    'Authorization': 'Bearer ' + notionAPI,
-                    'Notion-Version': '2022-06-28',
-                }
+            url: `https://api.notion.com/v1/databases/${databaseID}`,
+            method: 'GET',
+            headers: {
+                'Authorization': 'Bearer ' + notionAPI,
+                'Notion-Version': '2022-06-28',
             }
+        }
         )
 
         // Check if cover is present in the JSON response and then get the URL

src/upload/upoload_custom/Upload2NotionCustom.ts

@@ -1,11 +1,11 @@
-import {App, Notice, requestUrl, TFile} from "obsidian";
-import {markdownToBlocks} from "@tryfabric/martian";
+import { App, Notice, requestUrl, TFile } from "obsidian";
+import { markdownToBlocks } from "@tryfabric/martian";
 import * as yamlFrontMatter from "yaml-front-matter";
 // import * as yaml from "yaml"
 import MyPlugin from "src/main";
-import {DatabaseDetails, PluginSettings} from "../../ui/settingTabs";
-import {updateYamlInfo} from "../updateYaml";
-import {UploadBaseCustom} from "./BaseUpload2NotionCustom";
+import { DatabaseDetails, PluginSettings } from "../../ui/settingTabs";
+import { updateYamlInfo } from "../updateYaml";
+import { UploadBaseCustom } from "./BaseUpload2NotionCustom";
 
 export class Upload2NotionCustom extends UploadBaseCustom {
 	settings: PluginSettings;
@@ -26,7 +26,7 @@ export class Upload2NotionCustom extends UploadBaseCustom {
 	) {
 		await this.deletePage(notionID);
 
-		const {databaseID} = this.dbDetails;
+		const { databaseID } = this.dbDetails;
 
 		const databaseCover = await this.getDataBase(
 			databaseID
@@ -109,7 +109,7 @@ export class Upload2NotionCustom extends UploadBaseCustom {
 		const file2Block = markdownToBlocks(__content, options);
 		const frontmasster =
 			app.metadataCache.getFileCache(nowFile)?.frontmatter;
-		const {abName} = this.dbDetails
+		const { abName } = this.dbDetails
 		const notionIDKey = `NotionID-${abName}`;
 		const notionID = frontmasster ? frontmasster[notionIDKey] : null;
 
@@ -207,7 +207,7 @@ export class Upload2NotionCustom extends UploadBaseCustom {
 				};
 			case "multi_select":
 				return {
-					multi_select: Array.isArray(value) ? value.map(item => ({name: item})) : [{name: value}],
+					multi_select: Array.isArray(value) ? value.map(item => ({ name: item })) : [{ name: value }],
 				};
 		}
 	}
@@ -221,9 +221,9 @@ export class Upload2NotionCustom extends UploadBaseCustom {
 		const properties: { [key: string]: any } = {};
 
 		// Only include custom properties that have values
-		customProperties.forEach(({customName, customType}) => {
+		customProperties.forEach(({ customName, customType }) => {
 			if (customValues[customName] !== undefined) {
-			properties[customName] = this.buildPropertyObject(customName, customType, customValues);
+				properties[customName] = this.buildPropertyObject(customName, customType, customValues);
 			}
 		}
 		);

src/upload/upoload_custom/getMarkdownCustom.ts

@@ -1,6 +1,6 @@
-import {App, Notice} from "obsidian";
-import {i18nConfig} from "../../lang/I18n";
-import {DatabaseDetails} from "../../ui/settingTabs";
+import { App, Notice } from "obsidian";
+import { i18nConfig } from "../../lang/I18n";
+import { DatabaseDetails } from "../../ui/settingTabs";
 
 export async function getNowFileMarkdownContentCustom(
 	app: App,