restructure the code for further feature

src/upload/BaseUpload2Notion.ts

@@ -1,87 +1,90 @@
-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";
 
 export class UploadBase {
-	plugin: MyPlugin;
-	notion: Client;
-	agent: any;
-	constructor(plugin: MyPlugin) {
-		this.plugin = plugin;
-	}
+    plugin: MyPlugin;
+    notion: Client;
+    agent: any;
 
-	async deletePage(notionID: string) {
-		return requestUrl({
-			url: `https://api.notion.com/v1/blocks/${notionID}`,
-			method: 'DELETE',
-			headers: {
-				'Content-Type': 'application/json',
-				'Authorization': 'Bearer ' + this.plugin.settings.notionAPI,
-				'Notion-Version': '2022-06-28',
-			},
-			body: ''
-		});
-	}
+    constructor(plugin: MyPlugin) {
+        this.plugin = plugin;
+    }
 
-	async getDataBase(databaseID: string) {
-		const response = await requestUrl({
-				url: `https://api.notion.com/v1/databases/${databaseID}`,
-				method: 'GET',
-				headers: {
-					'Authorization': 'Bearer ' + this.plugin.settings.notionAPI,
-					'Notion-Version': '2022-06-28',
-				}
-			}
-		)
+    async deletePage(notionID: string) {
+        return requestUrl({
+            url: `https://api.notion.com/v1/blocks/${notionID}`,
+            method: 'DELETE',
+            headers: {
+                'Content-Type': 'application/json',
+                'Authorization': 'Bearer ' + this.plugin.settings.notionAPI,
+                'Notion-Version': '2022-06-28',
+            },
+            body: ''
+        });
+    }
 
-		// Check if cover is present in the JSON response and then get the URL
-		if (response.json.cover && response.json.cover.external) {
-			return response.json.cover.external.url;
-		} else {
-			return null;  // or some other default value, if you prefer
-		}
-	}
+    async getDataBase(databaseID: string) {
+        const response = await requestUrl({
+                url: `https://api.notion.com/v1/databases/${databaseID}`,
+                method: 'GET',
+                headers: {
+                    'Authorization': 'Bearer ' + this.plugin.settings.notionAPI,
+                    'Notion-Version': '2022-06-28',
+                }
+            }
+        )
 
-	async updateYamlInfo(yamlContent: string, nowFile: TFile, res: any, app: App, settings: any) {
-		let { url, id } = res.json
-		// replace www to notionID
-		const { notionID } = settings;
-		if (notionID !== "") {
-			// replace url str "www" to notionID
-			url = url.replace("www.notion.so", `${notionID}.notion.site`)
-		}
-		await app.fileManager.processFrontMatter(nowFile, yamlContent => {
-			if (yamlContent['notionID']) {
-				delete yamlContent['notionID']
-			}
-			if (yamlContent['link']) {
-				delete yamlContent['link']
-			}
-			// add new notionID and link
-			yamlContent.notionID = id;
-			yamlContent.link = url;
-		});
+        // Check if cover is present in the JSON response and then get the URL
+        if (response.json.cover && response.json.cover.external) {
+            return response.json.cover.external.url;
+        } else {
+            return null;  // or some other default value, if you prefer
+        }
+    }
 
-		try {
-			await navigator.clipboard.writeText(url)
-		} catch (error) {
-			new Notice(`复制链接失败，请手动复制${error}`)
-		}
-		// const __content = yamlContent.__content;
-		// delete yamlContent.__content
-		// const yamlhead = yaml.stringify(yamlContent)
-		// //  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;
-		// try {
-		// 	await nowFile.vault.modify(nowFile, content)
-		// } catch (error) {
-		// 	new Notice(`write file error ${error}`)
-		// }
-	}
+    async updateYamlInfo(yamlContent: string, nowFile: TFile, res: any, app: App, settings: any) {
+        let {url, id} = res.json
+        // replace www to notionID
+        const {notionUser} = this.plugin.settings;
+
+        if (notionUser !== "") {
+            // replace url str "www" to notionID
+            url = url.replace("www.notion.so", `${notionUser}.notion.site`)
+        }
+
+        await app.fileManager.processFrontMatter(nowFile, yamlContent => {
+            if (yamlContent['notionID']) {
+                delete yamlContent['notionID']
+            }
+            if (yamlContent['link']) {
+                delete yamlContent['link']
+            }
+            // add new notionID and link
+            yamlContent.notionID = id;
+            yamlContent.link = url;
+        });
+
+        try {
+            await navigator.clipboard.writeText(url)
+        } catch (error) {
+            new Notice(`复制链接失败，请手动复制${error}`)
+        }
+        // const __content = yamlContent.__content;
+        // delete yamlContent.__content
+        // const yamlhead = yaml.stringify(yamlContent)
+        // //  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;
+        // try {
+        // 	await nowFile.vault.modify(nowFile, content)
+        // } catch (error) {
+        // 	new Notice(`write file error ${error}`)
+        // }
+    }
 }

src/upload/Upload2NotionNext.ts

@@ -5,9 +5,11 @@ import { markdownToBlocks, } from "@tryfabric/martian";
 import * as yamlFrontMatter from "yaml-front-matter";
 // import * as yaml from "yaml"
 import MyPlugin from "src/main";
+import {PluginSettings} from "../ui/settingTabs";
 
 export class Upload2NotionNext extends UploadBase {
-	constructor(plugin: MyPlugin) {
+    settings: PluginSettings;
+    constructor(plugin: MyPlugin) {
         super(plugin);
     }
 
@@ -155,7 +157,7 @@ export class Upload2NotionNext extends UploadBase {
         }
     }
 
-    async syncMarkdownToNotionNext(title: string, emoji: string, cover: string, tags: string[], type: string, slug: string, stats: string, category: string, summary: string, paword: string, favicon: string, datetime: string, markdown: string, nowFile: TFile, app: App, settings: any): Promise<any> {
+    async syncMarkdownToNotionNext(title: string, emoji: string, cover: string, tags: string[], type: string, slug: string, stats: string, category: string, summary: string, paword: string, favicon: string, datetime: string, markdown: string, nowFile: TFile, app: App, settings: PluginSettings): Promise<any> {
         let res: any
         const yamlContent: any = yamlFrontMatter.loadFront(markdown);
         const __content = yamlContent.__content

src/upload/getMarkdown.ts

@@ -0,0 +1,62 @@
+import {App, Notice} from "obsidian";
+import {i18nConfig} from "../lang/I18n";
+import {PluginSettings} from "../ui/settingTabs";
+
+export async function getNowFileMarkdownContent(
+    app: App,
+    settings: PluginSettings,
+) {
+    const nowFile = app.workspace.getActiveFile();
+    const {NNon} = settings; // Change this line
+    let emoji = '';
+    let cover = '';
+    let tags = [];
+    let type = '';
+    let slug = '';
+    let stats = '';
+    let category = '';
+    let summary = '';
+    let paword = '';
+    let favicon = '';
+    let datetime = '';
+
+    const FileCache = app.metadataCache.getFileCache(nowFile);
+    try {
+        if (NNon) {
+            emoji = FileCache.frontmatter.titleicon;
+            cover = FileCache.frontmatter.coverurl;
+            tags = FileCache.frontmatter.tags;
+            type = FileCache.frontmatter.type;
+            slug = FileCache.frontmatter.slug;
+            stats = FileCache.frontmatter.stats;
+            category = FileCache.frontmatter.category;
+            summary = FileCache.frontmatter.summary;
+            paword = FileCache.frontmatter.password;
+            favicon = FileCache.frontmatter.icon;
+            datetime = FileCache.frontmatter.date;
+        }
+    } catch (error) {
+        new Notice(i18nConfig["set-tags-fail"]);
+    }
+    if (nowFile) {
+        const markDownData = await nowFile.vault.read(nowFile);
+        return {
+            markDownData,
+            nowFile,
+            emoji,
+            cover,
+            tags,
+            type,
+            slug,
+            stats,
+            category,
+            summary,
+            paword,
+            favicon,
+            datetime,
+        };
+    } else {
+        new Notice(i18nConfig["open-file"]);
+        return;
+    }
+}

src/upload/uploadCommand.ts

@@ -0,0 +1,54 @@
+import {i18nConfig} from "../lang/I18n";
+import {App, Notice} from "obsidian";
+import {getNowFileMarkdownContent} from "./getMarkdown";
+import {Upload2NotionNext} from "./Upload2NotionNext";
+import {Upload2NotionGeneral} from "./Upload2NotionGeneral";
+import {PluginSettings} from "../ui/settingTabs";
+import ObsidianSyncNotionPlugin from "../main";
+
+export async function uploadCommand(
+    plugin: ObsidianSyncNotionPlugin,
+    settings: PluginSettings,
+    app: App,
+) {
+
+    const {notionAPI, databaseID, NNon} = settings;
+
+    // Check if NNon exists
+    if (NNon === undefined) {
+        const NNonmessage = i18nConfig.NNonMissing;
+        new Notice(NNonmessage);
+        return;
+    }
+
+    // Check if the user has set up the Notion API and database ID
+    if (notionAPI === "" || databaseID === "") {
+        const setAPIMessage = i18nConfig["set-api-id"];
+        new Notice(setAPIMessage);
+        return;
+    }
+
+    const {markDownData, nowFile, emoji, cover, tags, type, slug, stats, category, summary, paword, favicon, datetime} = await getNowFileMarkdownContent(app, settings)
+
+    if (markDownData) {
+        const {basename} = nowFile;
+        let upload;
+        let res;
+
+        if (NNon) {
+            upload = new Upload2NotionNext(plugin);
+            res = await upload.syncMarkdownToNotionNext(basename, emoji, cover, tags, type, slug, stats, category, summary, paword, favicon, datetime, markDownData, nowFile, this.app, this.settings);
+        } else {
+            upload = new Upload2NotionGeneral(plugin);
+            res = await upload.syncMarkdownToNotionGeneral(basename, emoji, cover, tags, type, slug, stats, category, summary, paword, favicon, datetime, markDownData, nowFile, this.app, this.settings);
+        }
+
+
+        if (res.status === 200) {
+            new Notice(`${i18nConfig["sync-success"]}${basename}`);
+        } else {
+            new Notice(`${i18nConfig["sync-fail"]}${basename}`, 5000);
+        }
+
+    }
+}