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

feat: consistent sync function (requestUrl) for desktop and mobile

Browse Source
This commit is contained in:
Jiaxin Peng
2024-11-20 22:19:03 +00:00
parent a573ef728d
commit aac7bc154a
4 changed files with 196 additions and 274 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/upload/uploadCommand.ts
View File

@@ -50,8 +50,10 @@ export async function uploadCommandNext(
const {response} = res; const {response} = res;
if (response.status === 200) { if (response.status === 200) {
new Notice(`${i18nConfig["sync-preffix"]} ${basename} ${i18nConfig["sync-success"]}`).noticeEl.style.color = "green"; new Notice(`${i18nConfig["sync-preffix"]} ${basename} ${i18nConfig["sync-success"]}`).noticeEl.style.color = "green";
console.log(`${i18nConfig["sync-preffix"]} ${basename} ${i18nConfig["sync-success"]}`);
} else { } else {
new Notice(`${i18nConfig["sync-fail"]} ${basename}`, 5000); new Notice(`${i18nConfig["sync-fail"]} ${basename}`, 5000);
console.log(`${i18nConfig["sync-fail"]} ${basename}`);
} }
} }
@@ -88,8 +90,10 @@ export async function uploadCommandGeneral(
const {response} = res; const {response} = res;
if (response.status === 200) { if (response.status === 200) {
new Notice(`${i18nConfig["sync-preffix"]} ${basename} ${i18nConfig["sync-success"]}`).noticeEl.style.color = "green"; new Notice(`${i18nConfig["sync-preffix"]} ${basename} ${i18nConfig["sync-success"]}`).noticeEl.style.color = "green";
console.log(`${i18nConfig["sync-preffix"]} ${basename} ${i18nConfig["sync-success"]}`);
} else { } else {
new Notice(`${i18nConfig["sync-fail"]} ${basename}`, 5000); new Notice(`${i18nConfig["sync-fail"]} ${basename}`, 5000);
console.log(`${i18nConfig["sync-fail"]} ${basename}`);
} }
} }
@@ -124,10 +128,13 @@ export async function uploadCommandCustom(
const res = await upload.syncMarkdownToNotionCustom(cover, customValues, markDownData, nowFile, this.app); const res = await upload.syncMarkdownToNotionCustom(cover, customValues, markDownData, nowFile, this.app);
const {response} = res; const {response} = res;
if (response.status === 200) { if (response.status === 200) {
new Notice(`${i18nConfig["sync-preffix"]} ${basename} ${i18nConfig["sync-success"]}`).noticeEl.style.color = "green"; new Notice(`${i18nConfig["sync-preffix"]} ${basename} ${i18nConfig["sync-success"]}`).noticeEl.style.color = "green";
console.log(`${i18nConfig["sync-preffix"]} ${basename} ${i18nConfig["sync-success"]}`);
} else { } else {
new Notice(`${i18nConfig["sync-fail"]} ${basename}`, 5000); new Notice(`${i18nConfig["sync-fail"]} ${basename}`, 5000);
console.log(`${i18nConfig["sync-fail"]} ${basename}`);
} }
} }

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

@@ -1,11 +1,10 @@
import {App, Notice, TFile, Platform, requestUrl} from "obsidian"; import {App, Notice, TFile, requestUrl} from "obsidian";
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 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";
import {updateYamlInfo} from "../updateYaml"; import {updateYamlInfo} from "../updateYaml";
import fetch from 'node-fetch';
import {i18nConfig} from "../../lang/I18n"; import {i18nConfig} from "../../lang/I18n";
interface CreatePageResponse { interface CreatePageResponse {
@@ -142,15 +141,10 @@ export class Upload2NotionGeneral extends UploadBaseGeneral {
} }
console.log(bodyString) console.log(bodyString)
console.log(Platform.isDesktopApp)
let response: any; let response: any;
let data: any; let data: any;
if (Platform.isMobileApp) {
if(childArrLength > 100) {
new Notice(i18nConfig["reach-mobile-limit"], 5000);
} else {
response = await requestUrl({ response = await requestUrl({
url: `https://api.notion.com/v1/pages`, url: `https://api.notion.com/v1/pages`,
method: "POST", method: "POST",
@@ -162,31 +156,22 @@ export class Upload2NotionGeneral extends UploadBaseGeneral {
"Notion-Version": "2022-06-28", "Notion-Version": "2022-06-28",
}, },
body: JSON.stringify(bodyString), body: JSON.stringify(bodyString),
}); throw: false
}
}
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),
}); });
data = await response.json(); data = await response.json;
if (!response.ok) { // console.log(data)
// console.log(response.status)
if (response.status !== 200) {
new Notice(`Error ${data.status}: ${data.code} \n ${i18nConfig["CheckConsole"]}`, 5000); new Notice(`Error ${data.status}: ${data.code} \n ${i18nConfig["CheckConsole"]}`, 5000);
console.log(`Error message: \n ${data.message}`); console.log(`Error message: \n ${data.message}`);
} else { } else {
console.log(`Page created: ${data.url}`); console.log(`Page created: ${data.url}`);
console.log(`Page ID: ${data.id}`); console.log(`Page ID: ${data.id}`);
} }
//
// upload the rest of the blocks // upload the rest of the blocks
if (pushCount > 0) { if (pushCount > 0) {
for (let i = 0; i < pushCount; i++) { for (let i = 0; i < pushCount; i++) {
@@ -196,7 +181,8 @@ export class Upload2NotionGeneral extends UploadBaseGeneral {
console.log(extraBlocks) console.log(extraBlocks)
const extraResponse = await fetch(`https://api.notion.com/v1/blocks/${data.id}/children`, { const extraResponse = await requestUrl({
url: `https://api.notion.com/v1/blocks/${data.id}/children`,
method: "PATCH", method: "PATCH",
headers: { headers: {
"Content-Type": "application/json", "Content-Type": "application/json",
@@ -206,9 +192,9 @@ export class Upload2NotionGeneral extends UploadBaseGeneral {
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.status !== 200) {
new Notice(`Error ${extraData.status}: ${extraData.code} \n ${i18nConfig["CheckConsole"]}`, 5000); new Notice(`Error ${extraData.status}: ${extraData.code} \n ${i18nConfig["CheckConsole"]}`, 5000);
console.log(`Error message: \n ${extraData.message}`); console.log(`Error message: \n ${extraData.message}`);
} else { } else {
@@ -220,7 +206,6 @@ export class Upload2NotionGeneral extends UploadBaseGeneral {
} }
} }
} }
}
return { return {
response, response,
@@ -266,7 +251,8 @@ export class Upload2NotionGeneral extends UploadBaseGeneral {
let {response, data} = res; let {response, data} = res;
if (Platform.isDesktopApp) { // console.log(response)
if (response && response.status === 200) { if (response && response.status === 200) {
await updateYamlInfo( await updateYamlInfo(
markdown, markdown,
@@ -274,23 +260,9 @@ export class Upload2NotionGeneral extends UploadBaseGeneral {
data, data,
app, app,
this.plugin, this.plugin,
this.dbDetails
);
}
}
if (Platform.isMobileApp) {
if (response && response.status === 200) {
await updateYamlInfo(
markdown,
nowFile,
response,
app,
this.plugin,
this.dbDetails, this.dbDetails,
); );
} }
}
return res; return res;
} }

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

@@ -1,12 +1,11 @@
import {UploadBaseNext} from "./BaseUpload2NotionNext"; import {UploadBaseNext} from "./BaseUpload2NotionNext";
import {App, Notice, TFile, Platform, requestUrl} from "obsidian"; import {App, Notice, TFile, requestUrl} from "obsidian";
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 MyPlugin from "src/main"; 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 {i18nConfig} from "../../lang/I18n"; import {i18nConfig} from "../../lang/I18n";
interface CreatePageResponse { interface CreatePageResponse {
@@ -247,10 +246,6 @@ export class Upload2NotionNext extends UploadBaseNext {
let response: any; let response: any;
let data: any; let data: any;
if (Platform.isMobileApp) {
if(childArrLength > 100) {
new Notice(i18nConfig["reach-mobile-limit"], 5000);
} else {
response = await requestUrl({ response = await requestUrl({
url: `https://api.notion.com/v1/pages`, url: `https://api.notion.com/v1/pages`,
method: "POST", method: "POST",
@@ -262,31 +257,22 @@ export class Upload2NotionNext extends UploadBaseNext {
"Notion-Version": "2022-06-28", "Notion-Version": "2022-06-28",
}, },
body: JSON.stringify(bodyString), body: JSON.stringify(bodyString),
}); throw: false
}
}
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),
}); });
data = await response.json(); data = await response.json;
if (!response.ok) { // console.log(data)
// console.log(response.status)
if (response.status !== 200) {
new Notice(`Error ${data.status}: ${data.code} \n ${i18nConfig["CheckConsole"]}`, 5000); new Notice(`Error ${data.status}: ${data.code} \n ${i18nConfig["CheckConsole"]}`, 5000);
console.log(`Error message: \n ${data.message}`); console.log(`Error message: \n ${data.message}`);
} else { } else {
console.log(`Page created: ${data.url}`); console.log(`Page created: ${data.url}`);
console.log(`Page ID: ${data.id}`); console.log(`Page ID: ${data.id}`);
} }
//
// upload the rest of the blocks // upload the rest of the blocks
if (pushCount > 0) { if (pushCount > 0) {
for (let i = 0; i < pushCount; i++) { for (let i = 0; i < pushCount; i++) {
@@ -296,7 +282,8 @@ export class Upload2NotionNext extends UploadBaseNext {
console.log(extraBlocks) console.log(extraBlocks)
const extraResponse = await fetch(`https://api.notion.com/v1/blocks/${data.id}/children`, { const extraResponse = await requestUrl({
url: `https://api.notion.com/v1/blocks/${data.id}/children`,
method: "PATCH", method: "PATCH",
headers: { headers: {
"Content-Type": "application/json", "Content-Type": "application/json",
@@ -306,9 +293,9 @@ 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.status !== 200) {
new Notice(`Error ${extraData.status}: ${extraData.code} \n ${i18nConfig["CheckConsole"]}`, 5000); new Notice(`Error ${extraData.status}: ${extraData.code} \n ${i18nConfig["CheckConsole"]}`, 5000);
console.log(`Error message: \n ${extraData.message}`); console.log(`Error message: \n ${extraData.message}`);
} else { } else {
@@ -320,7 +307,6 @@ export class Upload2NotionNext extends UploadBaseNext {
} }
} }
} }
}
return { return {
response, response,
@@ -416,7 +402,8 @@ export class Upload2NotionNext extends UploadBaseNext {
let {response, data} = res; let {response, data} = res;
if (Platform.isDesktopApp) { // console.log(response)
if (response && response.status === 200) { if (response && response.status === 200) {
await updateYamlInfo( await updateYamlInfo(
markdown, markdown,
@@ -424,23 +411,9 @@ export class Upload2NotionNext extends UploadBaseNext {
data, data,
app, app,
this.plugin, this.plugin,
this.dbDetails
);
}
}
if (Platform.isMobileApp) {
if (response && response.status === 200) {
await updateYamlInfo(
markdown,
nowFile,
response,
app,
this.plugin,
this.dbDetails, this.dbDetails,
); );
} }
}
return res; return res;
} }

54
src/upload/upoload_custom/Upload2NotionCustom.ts
View File

@@ -1,11 +1,10 @@
import {App, Notice, Platform, TFile, requestUrl} from "obsidian"; import {App, Notice, TFile, requestUrl} from "obsidian";
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 MyPlugin from "src/main"; 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 {UploadBaseCustom} from "./BaseUpload2NotionCustom"; import {UploadBaseCustom} from "./BaseUpload2NotionCustom";
import fetch from 'node-fetch';
import {i18nConfig} from "../../lang/I18n"; import {i18nConfig} from "../../lang/I18n";
@@ -114,15 +113,10 @@ export class Upload2NotionCustom extends UploadBaseCustom {
} }
console.log(bodyString) console.log(bodyString)
console.log(Platform.isDesktopApp)
let response: any; let response: any;
let data: any; let data: any;
if (Platform.isMobileApp) {
if(childArrLength > 100) {
new Notice(i18nConfig["reach-mobile-limit"], 5000);
} else {
response = await requestUrl({ response = await requestUrl({
url: `https://api.notion.com/v1/pages`, url: `https://api.notion.com/v1/pages`,
method: "POST", method: "POST",
@@ -134,31 +128,22 @@ export class Upload2NotionCustom extends UploadBaseCustom {
"Notion-Version": "2022-06-28", "Notion-Version": "2022-06-28",
}, },
body: JSON.stringify(bodyString), body: JSON.stringify(bodyString),
}); throw: false
}
}
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),
}); });
data = await response.json(); data = await response.json;
if (!response.ok) { // console.log(data)
// console.log(response.status)
if (response.status !== 200) {
new Notice(`Error ${data.status}: ${data.code} \n ${i18nConfig["CheckConsole"]}`, 5000); new Notice(`Error ${data.status}: ${data.code} \n ${i18nConfig["CheckConsole"]}`, 5000);
console.log(`Error message: \n ${data.message}`); console.log(`Error message: \n ${data.message}`);
} else { } else {
console.log(`Page created: ${data.url}`); console.log(`Page created: ${data.url}`);
console.log(`Page ID: ${data.id}`); console.log(`Page ID: ${data.id}`);
} }
//
// upload the rest of the blocks // upload the rest of the blocks
if (pushCount > 0) { if (pushCount > 0) {
for (let i = 0; i < pushCount; i++) { for (let i = 0; i < pushCount; i++) {
@@ -168,7 +153,8 @@ export class Upload2NotionCustom extends UploadBaseCustom {
console.log(extraBlocks) console.log(extraBlocks)
const extraResponse = await fetch(`https://api.notion.com/v1/blocks/${data.id}/children`, { const extraResponse = await requestUrl({
url: `https://api.notion.com/v1/blocks/${data.id}/children`,
method: "PATCH", method: "PATCH",
headers: { headers: {
"Content-Type": "application/json", "Content-Type": "application/json",
@@ -178,9 +164,9 @@ export class Upload2NotionCustom extends UploadBaseCustom {
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.status !== 200) {
new Notice(`Error ${extraData.status}: ${extraData.code} \n ${i18nConfig["CheckConsole"]}`, 5000); new Notice(`Error ${extraData.status}: ${extraData.code} \n ${i18nConfig["CheckConsole"]}`, 5000);
console.log(`Error message: \n ${extraData.message}`); console.log(`Error message: \n ${extraData.message}`);
} else { } else {
@@ -192,7 +178,6 @@ export class Upload2NotionCustom extends UploadBaseCustom {
} }
} }
} }
}
return { return {
response, // for status code response, // for status code
@@ -238,7 +223,6 @@ export class Upload2NotionCustom extends UploadBaseCustom {
// console.log(response) // console.log(response)
if (Platform.isDesktopApp) {
if (response && response.status === 200) { if (response && response.status === 200) {
await updateYamlInfo( await updateYamlInfo(
markdown, markdown,
@@ -246,23 +230,9 @@ export class Upload2NotionCustom extends UploadBaseCustom {
data, data,
app, app,
this.plugin, this.plugin,
this.dbDetails
);
}
}
if (Platform.isMobileApp) {
if (response && response.status === 200) {
await updateYamlInfo(
markdown,
nowFile,
response,
app,
this.plugin,
this.dbDetails, this.dbDetails,
); );
} }
}
return res; return res;
} }