jxpeng98/obsidian-to-NotionNext
1
0
Fork 0
mirror of https://github.com/jxpeng98/obsidian-to-NotionNext synced 2026-07-29 08:08:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: test the desktop function for next and general

Browse Source
This commit is contained in:
Jiaxin Peng
2024-08-31 23:43:19 +01:00
parent f282dde1b7
commit 885ccba027
2 changed files with 192 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

151
src/upload/upload_general/Upload2NotionGeneral.ts
View File

@@ -1,8 +1,6 @@
import {App, Notice, TFile} from "obsidian"; import {App, Notice, TFile, Platform, requestUrl} from "obsidian";
import {Client} from "@notionhq/client";
import {markdownToBlocks} from "@jxpeng98/martian"; import {markdownToBlocks} from "@jxpeng98/martian";
import * as yamlFrontMatter from "yaml-front-matter"; import * as yamlFrontMatter from "yaml-front-matter";
// import * as yaml from "yaml"
import MyPlugin from "src/main"; import MyPlugin from "src/main";
import {DatabaseDetails, PluginSettings} from "../../ui/settingTabs"; import {DatabaseDetails, PluginSettings} from "../../ui/settingTabs";
import {UploadBaseGeneral} from "./BaseUpload2NotionGeneral"; import {UploadBaseGeneral} from "./BaseUpload2NotionGeneral";
@@ -10,6 +8,11 @@ import {updateYamlInfo} from "../updateYaml";
import fetch from 'node-fetch'; import fetch from 'node-fetch';
import {i18nConfig} from "../../lang/I18n"; import {i18nConfig} from "../../lang/I18n";
interface CreatePageResponse {
response: any;
data: any;
}
export class Upload2NotionGeneral extends UploadBaseGeneral { export class Upload2NotionGeneral extends UploadBaseGeneral {
settings: PluginSettings; settings: PluginSettings;
dbDetails: DatabaseDetails; dbDetails: DatabaseDetails;
@@ -48,7 +51,7 @@ export class Upload2NotionGeneral extends UploadBaseGeneral {
cover: string, cover: string,
tags: string[], tags: string[],
childArr: any, childArr: any,
) { ): Promise<CreatePageResponse> {
const { const {
databaseID, databaseID,
@@ -139,63 +142,89 @@ export class Upload2NotionGeneral extends UploadBaseGeneral {
} }
console.log(bodyString) console.log(bodyString)
console.log(Platform.isDesktopApp)
const response = await fetch("https://api.notion.com/v1/pages", { let response: any;
method: "POST", let data: any;
headers: {
"Content-Type": "application/json",
"Authorization": "Bearer " + notionAPI,
"Notion-Version": "2022-06-28",
},
body: JSON.stringify(bodyString),
});
const data: any = await response.json(); if (Platform.isMobileApp) {
if(childArrLength > 100) {
if (!response.ok) { new Notice(i18nConfig["reach-mobile-limit"], 5000);
new Notice(`Error ${data.status}: ${data.code} \n ${i18nConfig["CheckConsole"]}`, 5000); } else {
} else { response = await requestUrl({
console.log(`Page created: ${data.url}`); url: `https://api.notion.com/v1/pages`,
console.log(`Page ID: ${data.id}`); method: "POST",
}
// upload the rest of the blocks
if (pushCount > 0) {
for (let i = 0; i < pushCount; i++) {
const extraBlocks = {
children: extraArr[i],
};
console.log(extraBlocks)
const extraResponse = await fetch(`https://api.notion.com/v1/blocks/${data.id}/children`, {
method: "PATCH",
headers: { headers: {
"Content-Type": "application/json", "Content-Type": "application/json",
"Authorization": "Bearer " + notionAPI, // 'User-Agent': 'obsidian.md',
Authorization:
"Bearer " + notionAPI,
"Notion-Version": "2022-06-28", "Notion-Version": "2022-06-28",
}, },
body: JSON.stringify(extraBlocks), body: JSON.stringify(bodyString),
}); });
}
}
const extraData: any = await extraResponse.json(); if (Platform.isDesktopApp) {
response = await fetch("https://api.notion.com/v1/pages", {
method: "POST",
headers: {
"Content-Type": "application/json",
"Authorization": "Bearer " + notionAPI,
"Notion-Version": "2022-06-28",
},
body: JSON.stringify(bodyString),
});
if (!extraResponse.ok) { data = await response.json();
new Notice(`Error ${extraData.status}: ${extraData.code} \n ${i18nConfig["CheckConsole"]}`, 5000);
console.log(`Error message: \n ${extraData.message}`); if (!response.ok) {
} else { new Notice(`Error ${data.status}: ${data.code} \n ${i18nConfig["CheckConsole"]}`, 5000);
console.log(`${i18nConfig["ExtraBlockUploaded"]} to page: ${data.id}`); console.log(`Error message: \n ${data.message}`);
if (i === pushCount - 1) { } else {
console.log(`${i18nConfig["BlockUploaded"]} to page: ${data.id}`); console.log(`Page created: ${data.url}`);
new Notice(`${i18nConfig["BlockUploaded"]} page: ${data.id}`, 5000); console.log(`Page ID: ${data.id}`);
}
// upload the rest of the blocks
if (pushCount > 0) {
for (let i = 0; i < pushCount; i++) {
const extraBlocks = {
children: extraArr[i],
};
console.log(extraBlocks)
const extraResponse = await fetch(`https://api.notion.com/v1/blocks/${data.id}/children`, {
method: "PATCH",
headers: {
"Content-Type": "application/json",
"Authorization": "Bearer " + notionAPI,
"Notion-Version": "2022-06-28",
},
body: JSON.stringify(extraBlocks),
});
const extraData: any = await extraResponse.json();
if (!extraResponse.ok) {
new Notice(`Error ${extraData.status}: ${extraData.code} \n ${i18nConfig["CheckConsole"]}`, 5000);
console.log(`Error message: \n ${extraData.message}`);
} else {
console.log(`${i18nConfig["ExtraBlockUploaded"]} to page: ${data.id}`);
if (i === pushCount - 1) {
console.log(`${i18nConfig["BlockUploaded"]} to page: ${data.id}`);
new Notice(`${i18nConfig["BlockUploaded"]} page: ${data.id}`, 5000);
}
} }
} }
} }
} }
return { return {
response, // for status code response,
data // for id and url data
} }
} }
@@ -216,11 +245,11 @@ export class Upload2NotionGeneral extends UploadBaseGeneral {
const yamlContent: any = yamlFrontMatter.loadFront(markdown); const yamlContent: any = yamlFrontMatter.loadFront(markdown);
const __content = yamlContent.__content; const __content = yamlContent.__content;
const file2Block = markdownToBlocks(__content, options); const file2Block = markdownToBlocks(__content, options);
const frontmasster = const frontMatter =
app.metadataCache.getFileCache(nowFile)?.frontmatter; app.metadataCache.getFileCache(nowFile)?.frontmatter;
const {abName} = this.dbDetails const {abName} = this.dbDetails
const notionIDKey = `NotionID-${abName}`; const notionIDKey = `NotionID-${abName}`;
const notionID = frontmasster ? frontmasster[notionIDKey] : null; const notionID = frontMatter ? frontMatter[notionIDKey] : null;
if (notionID) { if (notionID) {
@@ -237,10 +266,30 @@ export class Upload2NotionGeneral extends UploadBaseGeneral {
let {response, data} = res; let {response, data} = res;
// console.log(response) if (Platform.isDesktopApp) {
if (response && response.status === 200) {
await updateYamlInfo(
markdown,
nowFile,
data,
app,
this.plugin,
this.dbDetails
);
}
}
if (response && response.status === 200) { if (Platform.isMobileApp) {
await updateYamlInfo(markdown, nowFile, data, app, this.plugin, this.dbDetails); if (response && response.status === 200) {
await updateYamlInfo(
markdown,
nowFile,
response,
app,
this.plugin,
this.dbDetails,
);
}
} }
return res; return res;

146
src/upload/upload_next/Upload2NotionNext.ts
View File

@@ -1,5 +1,5 @@
import {UploadBaseNext} from "./BaseUpload2NotionNext"; import {UploadBaseNext} from "./BaseUpload2NotionNext";
import {App, Notice, TFile} from "obsidian"; import {App, Notice, TFile, Platform, requestUrl} from "obsidian";
import {Client} from "@notionhq/client"; import {Client} from "@notionhq/client";
import {markdownToBlocks} from "@jxpeng98/martian"; import {markdownToBlocks} from "@jxpeng98/martian";
import * as yamlFrontMatter from "yaml-front-matter"; import * as yamlFrontMatter from "yaml-front-matter";
@@ -8,9 +8,14 @@ import MyPlugin from "src/main";
import {DatabaseDetails, PluginSettings} from "../../ui/settingTabs"; import {DatabaseDetails, PluginSettings} from "../../ui/settingTabs";
import {updateYamlInfo} from "../updateYaml"; import {updateYamlInfo} from "../updateYaml";
import {LIMITS, paragraph} from "@jxpeng98/martian/src/notion"; import {LIMITS, paragraph} from "@jxpeng98/martian/src/notion";
import fetch from "node-fetch"; import fetch from 'node-fetch';
import {i18nConfig} from "../../lang/I18n"; import {i18nConfig} from "../../lang/I18n";
interface CreatePageResponse {
response: any;
data: any;
}
export class Upload2NotionNext extends UploadBaseNext { export class Upload2NotionNext extends UploadBaseNext {
settings: PluginSettings; settings: PluginSettings;
dbDetails: DatabaseDetails; dbDetails: DatabaseDetails;
@@ -79,7 +84,7 @@ export class Upload2NotionNext extends UploadBaseNext {
favicon: string, favicon: string,
datetime: string, datetime: string,
childArr: any, childArr: any,
) { ): Promise<CreatePageResponse> {
const {databaseID, notionAPI} = this.dbDetails; const {databaseID, notionAPI} = this.dbDetails;
// remove the annotations from the childArr if type is code block // remove the annotations from the childArr if type is code block
@@ -241,39 +246,59 @@ export class Upload2NotionNext extends UploadBaseNext {
console.log(bodyString); console.log(bodyString);
const response = await fetch("https://api.notion.com/v1/pages", { let response: any;
method: "POST", let data: any;
headers: {
"Content-Type": "application/json",
Authorization: "Bearer " + notionAPI,
"Notion-Version": "2022-06-28",
},
body: JSON.stringify(bodyString),
});
const data: any = await response.json(); if (Platform.isMobileApp) {
if(childArrLength > 100) {
// can use response.ok or response.status === 200 new Notice(i18nConfig["reach-mobile-limit"], 5000);
if (!response.ok) { } else {
new Notice(`Error ${data.status}: ${data.code} \n ${i18nConfig["CheckConsole"]}`, 5000); response = await requestUrl({
console.log(`Error message: \n ${data.message}`); url: `https://api.notion.com/v1/pages`,
} else { method: "POST",
console.log(`Page created: ${data.url}`); headers: {
console.log(`Page ID: ${data.id}`); "Content-Type": "application/json",
// 'User-Agent': 'obsidian.md',
Authorization:
"Bearer " + notionAPI,
"Notion-Version": "2022-06-28",
},
body: JSON.stringify(bodyString),
});
}
} }
// if the childArr is over 100, patch the rest of the blocks append to the page if (Platform.isDesktopApp) {
if (pushCount > 0) { response = await fetch("https://api.notion.com/v1/pages", {
for (let i = 0; i < pushCount; i++) { method: "POST",
const extraBlocks = { headers: {
children: extraArr[i] "Content-Type": "application/json",
} "Authorization": "Bearer " + notionAPI,
"Notion-Version": "2022-06-28",
},
body: JSON.stringify(bodyString),
});
console.log(extraBlocks) data = await response.json();
const extraResponse = await fetch( if (!response.ok) {
`https://api.notion.com/v1/blocks/${data.id}/children`, new Notice(`Error ${data.status}: ${data.code} \n ${i18nConfig["CheckConsole"]}`, 5000);
{ console.log(`Error message: \n ${data.message}`);
} else {
console.log(`Page created: ${data.url}`);
console.log(`Page ID: ${data.id}`);
}
// upload the rest of the blocks
if (pushCount > 0) {
for (let i = 0; i < pushCount; i++) {
const extraBlocks = {
children: extraArr[i],
};
console.log(extraBlocks)
const extraResponse = await fetch(`https://api.notion.com/v1/blocks/${data.id}/children`, {
method: "PATCH", method: "PATCH",
headers: { headers: {
"Content-Type": "application/json", "Content-Type": "application/json",
@@ -283,27 +308,25 @@ export class Upload2NotionNext extends UploadBaseNext {
body: JSON.stringify(extraBlocks), body: JSON.stringify(extraBlocks),
}); });
const extraData: any = await extraResponse.json(); const extraData: any = await extraResponse.json();
if (!extraResponse.ok) { if (!extraResponse.ok) {
new Notice( new Notice(`Error ${extraData.status}: ${extraData.code} \n ${i18nConfig["CheckConsole"]}`, 5000);
`Extra Block: Error ${extraData.status}: ${extraData.code} \n ${i18nConfig["CheckConsole"]}`, console.log(`Error message: \n ${extraData.message}`);
5000, } else {
); console.log(`${i18nConfig["ExtraBlockUploaded"]} to page: ${data.id}`);
console.log(`Error message: \n ${extraData.message}`); if (i === pushCount - 1) {
} else { console.log(`${i18nConfig["BlockUploaded"]} to page: ${data.id}`);
console.log(`${i18nConfig["ExtraBlockUploaded"]} to page: ${data.id}`); new Notice(`${i18nConfig["BlockUploaded"]} page: ${data.id}`, 5000);
if (i === pushCount - 1) { }
console.log(`${i18nConfig["BlockUploaded"]} to page: ${data.id}`);
new Notice(`${i18nConfig["BlockUploaded"]} page: ${data.id}`, 5000);
} }
} }
} }
} }
return { return {
response, // for status code response,
data, // for id and url data
}; };
} }
@@ -395,15 +418,30 @@ export class Upload2NotionNext extends UploadBaseNext {
let {response, data} = res; let {response, data} = res;
if (response && response.status === 200) { if (Platform.isDesktopApp) {
await updateYamlInfo( if (response && response.status === 200) {
markdown, await updateYamlInfo(
nowFile, markdown,
data, nowFile,
app, data,
this.plugin, app,
this.dbDetails, this.plugin,
); this.dbDetails
);
}
}
if (Platform.isMobileApp) {
if (response && response.status === 200) {
await updateYamlInfo(
markdown,
nowFile,
response,
app,
this.plugin,
this.dbDetails,
);
}
} }
return res; return res;