Skip to content

Commit

Permalink
Backup mobile requesturl after version 2.4.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@jxpeng98
jxpeng98 committed Sep 1, 2024
1 parent 885ccba commit a90e487
Show file tree
Hide file tree
Showing 4 changed files with 172 additions and 173 deletions.
3 changes: 3 additions & 0 deletions src/upload/uploadCommand.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,9 @@ export async function uploadCommandGeneral(

const {markDownData, nowFile, cover, tags} = await getNowFileMarkdownContentGeneral(app, settings)

new Notice(`Start upload ${nowFile.basename}`);
console.log(`Start upload ${nowFile.basename}`);

if (markDownData) {
const {basename} = nowFile;

Expand Down
112 changes: 56 additions & 56 deletions src/upload/upload_general/Upload2NotionGeneral.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import MyPlugin from "src/main";
import {DatabaseDetails, PluginSettings} from "../../ui/settingTabs";
import {UploadBaseGeneral} from "./BaseUpload2NotionGeneral";
import {updateYamlInfo} from "../updateYaml";
import fetch from 'node-fetch';
// import fetch from 'node-fetch';
import {i18nConfig} from "../../lang/I18n";

interface CreatePageResponse {
Expand Down Expand Up @@ -166,61 +166,61 @@ export class Upload2NotionGeneral extends UploadBaseGeneral {
}
}

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();

if (!response.ok) {
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",
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);
}
}
}
}
}
// 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();
//
// if (!response.ok) {
// 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",
// 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 {
response,
Expand Down
114 changes: 56 additions & 58 deletions src/upload/upload_next/Upload2NotionNext.ts
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
import {UploadBaseNext} from "./BaseUpload2NotionNext";
import {App, Notice, TFile, Platform, requestUrl} from "obsidian";
import {Client} from "@notionhq/client";
import {markdownToBlocks} from "@jxpeng98/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 {LIMITS, paragraph} from "@jxpeng98/martian/src/notion";
import fetch from 'node-fetch';
// import fetch from 'node-fetch';
import {i18nConfig} from "../../lang/I18n";

interface CreatePageResponse {
Expand Down Expand Up @@ -268,61 +266,61 @@ export class Upload2NotionNext extends UploadBaseNext {
}
}

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();

if (!response.ok) {
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",
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);
}
}
}
}
}
// 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();
//
// if (!response.ok) {
// 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",
// 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 {
response,
Expand Down
Loading

0 comments on commit a90e487

Please sign in to comment.