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

Next: use node-fetch to post notes for a better debug

Browse Source
This commit is contained in:
Jiaxin Peng
2024-07-28 00:52:27 +01:00
parent 193d3f6f87
commit 1d5792c966
3 changed files with 43 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/upload/uploadCommand.ts
View File

@@ -43,13 +43,15 @@ export async function uploadCommandNext(
if (markDownData) {
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);
if (res.status === 200) {
const { response } = res;
if (response.status === 200) {
new Notice(`${i18nConfig["sync-preffix"]} ${basename} ${i18nConfig["sync-success"]}`).noticeEl.style.color = "green";
} else {
new Notice(`${i18nConfig["sync-fail"]}${basename}`, 5000);
new Notice(`${i18nConfig["sync-fail"]} ${basename}`, 5000);
}
}
@@ -83,7 +85,7 @@ export async function uploadCommandGeneral(
if (res.status === 200) {
new Notice(`${i18nConfig["sync-preffix"]} ${basename} ${i18nConfig["sync-success"]}`).noticeEl.style.color = "green";
} else {
new Notice(`${i18nConfig["sync-fail"]}${basename}`, 5000);
new Notice(`${i18nConfig["sync-fail"]} ${basename}`, 5000);
}
}

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

@@ -1,5 +1,5 @@
import { UploadBaseNext } from "./BaseUpload2NotionNext";
import { App, Notice, requestUrl, TFile } from "obsidian";
import { App, Notice, TFile } from "obsidian";
import { Client } from '@notionhq/client';
import { markdownToBlocks, } from "@tryfabric/martian";
import * as yamlFrontMatter from "yaml-front-matter";
@@ -8,6 +8,7 @@ import MyPlugin from "src/main";
import { DatabaseDetails, PluginSettings } from "../../ui/settingTabs";
import { updateYamlInfo } from "../updateYaml";
import { LIMITS, paragraph } from "@tryfabric/martian/src/notion";
import fetch from 'node-fetch';
export class Upload2NotionNext extends UploadBaseNext {
settings: PluginSettings;
@@ -204,21 +205,33 @@ export class Upload2NotionNext extends UploadBaseNext {
}
}
try {
return await requestUrl({
url: `https://api.notion.com/v1/pages`,
method: 'POST',
headers: {
'Content-Type': 'application/json',
// 'User-Agent': 'obsidian.md',
'Authorization': 'Bearer ' + notionAPI,
'Notion-Version': '2022-06-28',
},
body: JSON.stringify(bodyString),
})
} catch (error) {
new Notice(`network error ${error}`)
}
console.log(bodyString)
const 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),
});
const data: any = await response.json();
// can use response.ok or response.status === 200
if (!response.ok) {
new Notice(`Error ${data.status}: ${data.code} \n Check the console for more information \n opt+cmd+i/ctrl+shift+i`, 5000);
console.log(`Error message: \n ${data.message}`);
} else {
console.log(`Page created: ${data.url}`);
console.log(`Page ID: ${data.id}`);
}
return {
response, // for status code
data // for id and url
}
}
async syncMarkdownToNotionNext(
@@ -309,12 +322,13 @@ export class Upload2NotionNext extends UploadBaseNext {
);
}
if (res.status === 200) {
await updateYamlInfo(markdown, nowFile, res, app, this.plugin, this.dbDetails)
} else {
new Notice(`${res.text}`)
}
return res
let {response, data} = res;
if (response && response.status === 200) {
await updateYamlInfo(markdown, nowFile, data, app, this.plugin, this.dbDetails);
}
return res;
}
}

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

@@ -1,4 +1,4 @@
import {App, Notice, requestUrl, TFile} from "obsidian";
import {App, Notice, TFile} from "obsidian";
import {markdownToBlocks} from "@tryfabric/martian";
import * as yamlFrontMatter from "yaml-front-matter";
// import * as yaml from "yaml"
@@ -88,7 +88,7 @@ export class Upload2NotionCustom extends UploadBaseCustom {
const data: any = await response.json();
if (!response.ok) {
new Notice(`Error ${data.status}: ${data.code} \n Check the console for more information \n opt+cmd+i/ctrl+shift+i`, 5000);
console.log(data.message);
console.log(`Error message: \n ${data.message}`);
} else {
console.log(`Page created: ${data.url}`);
console.log(`Page ID: ${data.id}`);
@@ -140,8 +140,6 @@ export class Upload2NotionCustom extends UploadBaseCustom {
if (response && response.status === 200) {
await updateYamlInfo(markdown, nowFile, data, app, this.plugin, this.dbDetails);
} else {
new Notice(`${res.text}`);
}
return res;