Finalized import notes with errors command

Author: phpusr

TODO.md

@@ -1,3 +1,3 @@
 # TODO
 
-- Добавить команду повторного импорта заметок с ошибками
+- Use sqlite instead of PostgresQL

index.js

@@ -1,4 +1,4 @@
-import { getImportedWithErrorsNotes, getImportedNotesStatus, importNotes } from './src/notes_importer.js'
+import { getImportedWithErrorsNotes, getImportedNotesStatus, importNotes, importNotesWithErrors } from './src/notes_importer.js'
 import { cleanDb } from './src/db.js'
 
 await main()
@@ -15,7 +15,7 @@ async function main() {
       await importNotes(args[1])
       return
     case '--import-with-errors':
-      await importNotes(args[1], true)
+      await importNotesWithErrors(args[1])
       return
     case '--status':
       await printStatus(args[1])

src/db.js

@@ -9,7 +9,7 @@ const pool = new pg.Pool({
 
 export async function loadImportStatuses() {
   const res = await pool.query({
-    text: 'SELECT * FROM imported_notes'
+    text: 'SELECT * FROM imported_notes ORDER BY id'
   })
   return res.rows
 }
@@ -21,6 +21,13 @@ export async function addImportStatus({ noteId, title, filePath, imported, error
   })
 }
 
+export async function updateImportStatus({ noteId, title, imported, error }){
+  await pool.query({
+    text: 'UPDATE imported_notes SET "title" = $1, imported = $2, error = $3 WHERE "noteId" = $4',
+    values: [title, imported, error, noteId]
+  })
+}
+
 export async function cleanDb() {
   // noinspection SqlWithoutWhere
   await pool.query({

src/notes_importer.js

@@ -1,7 +1,7 @@
-import { lstatSync, readdirSync, readFileSync } from 'node:fs'
+import { lstatSync, readdirSync, readFileSync, existsSync } from 'node:fs'
 import { markdownToBlocks } from '@tryfabric/martian'
-import { addBlocks, createPage } from './notion_api.js'
-import { addImportStatus, loadImportStatuses } from './db.js'
+import { addBlocks, archivePage, createPage } from './notion_api.js'
+import { addImportStatus, loadImportStatuses, updateImportStatus } from './db.js'
 
 
 const importedNotes = {}
@@ -48,6 +48,57 @@ export async function importNotes(notesDir, onlyWithErrors = false) {
   console.info('\nDONE.')
 }
 
+export async function importNotesWithErrors(notesDir) {
+  const notes = (await loadImportStatuses()).filter(it => it.error)
+  let fileIndex = 0
+
+  for (const noteInfo of notes) {
+    const progress = Math.round(++fileIndex / notes.length * 100)
+    console.log(`\n[${progress}%][${fileIndex}/${notes.length}] ${noteInfo.filePath}`)
+    console.log('-'.repeat(100) + '\n')
+    const filePath = `${notesDir}/${noteInfo.filePath}`
+
+    noteInfo.imported = true
+    noteInfo.error = null
+
+    if (!existsSync(filePath)) {
+      console.log(`File: "${filePath}" was deleted and will be archive in Notion`)
+      try {
+        await archivePage(noteInfo.noteId)
+      } catch (e) {
+        noteInfo.imported = false
+        noteInfo.error = e.body || e
+        console.error(`ERROR with note id: ${noteInfo.id}`)
+      }
+
+      await updateImportStatus(noteInfo)
+      continue
+    }
+
+    noteInfo.data = ''
+    try {
+      noteInfo.data = readFileSync(filePath, 'utf8')
+    } catch (e) {
+      console.error('error in file: ', noteInfo.filePath, '\n', e)
+    }
+
+    if (!noteInfo.data) {
+      console.log(`File: "${filePath}" is empty`)
+      continue
+    }
+
+    const blocks = markdownToBlocks(noteInfo.data)
+    try {
+      await addBlocks({ parentId: noteInfo.noteId, blocks })
+    } catch (e) {
+      noteInfo.imported = false
+      noteInfo.error = e.body || e
+      console.error('ERROR')
+    }
+    await updateImportStatus(noteInfo)
+  }
+}
+
 async function createParentNotes(relFilePath) {
   let dirPath = ''
   let parentId = ''

src/notion_api.js

@@ -30,9 +30,22 @@ export async function createPage({ title, pageId }) {
   })
 }
 
+export async function archivePage(pageId) {
+  await notion.pages.update({
+    page_id: pageId,
+    archived: true,
+  })
+}
+
 export async function addBlocks({ parentId, blocks }){
   return await notion.blocks.children.append({
     block_id: parentId,
     children: blocks
   })
 }
+
+export async function deleteBlock(blockId) {
+  return await notion.blocks.delete({
+    block_id: blockId,
+  })
+}