Merge pull request #48 from omnivore-app/fix/update-existing-block

fix/update existing block

Author: sywhb

package.json

@@ -26,7 +26,8 @@
     "@logseq/libs": "^0.0.6",
     "diff-match-patch": "^1.0.5",
     "logseq-dateutils": "^0.0.22",
-    "luxon": "^3.0.1"
+    "luxon": "^3.0.1",
+    "markdown-escape": "^1.1.0"
   },
   "devDependencies": {
     "@semantic-release/changelog": "^6.0.1",
@@ -35,6 +36,7 @@
     "@tsconfig/node16": "^1.0.1",
     "@types/diff-match-patch": "^1.0.32",
     "@types/luxon": "^2.3.2",
+    "@types/markdown-escape": "^1.1.0",
     "@typescript-eslint/eslint-plugin": "^5.9.0",
     "@typescript-eslint/parser": "^5.9.0",
     "eslint": "^8.6.0",

src/index.ts

@@ -10,8 +10,8 @@ import {
   Article,
   compareHighlightsInFile,
   getHighlightLocation,
-  getHighlightPoint,
   loadArticles,
+  markdownEscape,
   PageType,
 } from './util'
 import { DateTime } from 'luxon'
@@ -130,7 +130,9 @@ const fetchOmnivore = async (inBackground = false) => {
       const articleBatch: IBatchBlock[] = []
       for (const article of articles) {
         // Build content string
-        let content = `[${article.title}](https://omnivore.app/me/${article.slug})`
+        let content = `[**${markdownEscape(
+          article.title
+        )}**](https://omnivore.app/me/${article.slug})`
         content += '\ncollapsed:: true'
 
         const displaySiteName =
@@ -154,16 +156,6 @@ const fetchOmnivore = async (inBackground = false) => {
           preferredDateFormat
         )}`
 
-        // remove existing block for the same article
-        const existingBlocks = await logseq.DB.q<BlockEntity>(
-          `"${article.slug}"`
-        )
-        if (existingBlocks) {
-          for (const block of existingBlocks) {
-            block.uuid && (await logseq.Editor.removeBlock(block.uuid))
-          }
-        }
-
         // sort highlights by location if selected in options
         highlightOrder === HighlightOrder.LOCATION &&
           article.highlights?.sort((a, b) => {
@@ -181,21 +173,96 @@ const fetchOmnivore = async (inBackground = false) => {
               return compareHighlightsInFile(a, b)
             }
           })
-
-        const highlightBatch = article.highlights?.map((it) => {
-          const noteChild = it.annotation
-            ? { content: it.annotation }
-            : undefined
-          return {
-            content: `>> ${it.quote} [⤴️](https://omnivore.app/me/${article.slug}#${it.id})`,
-            children: noteChild ? [noteChild] : undefined,
+        const highlightBatch: IBatchBlock[] =
+          article.highlights?.map((it) => {
+            const noteChild = it.annotation
+              ? { content: it.annotation }
+              : undefined
+            return {
+              content: `>> ${markdownEscape(
+                it.quote
+              )} [⤴️](https://omnivore.app/me/${article.slug}#${it.id})`,
+              children: noteChild ? [noteChild] : undefined,
+            }
+          }) || []
+
+        let isNewArticle = true
+        // update existing block if article is already in the page
+        const existingBlocks = (
+          await logseq.DB.datascriptQuery<BlockEntity[]>(
+            `[:find (pull ?b [*])
+                    :where
+                      [?b :block/page ?p]
+                      [?p :block/original-name "${pageName}"]
+                      [?b :block/content ?c]
+                      [(clojure.string/includes? ?c "${article.slug}")]]`
+          )
+        ).flat()
+        if (existingBlocks.length > 0) {
+          isNewArticle = false
+          const existingBlock = existingBlocks[0]
+          // update existing block
+          if (existingBlock.content !== content) {
+            await logseq.Editor.updateBlock(existingBlock.uuid, content)
           }
-        })
+          if (highlightBatch.length > 0) {
+            // append highlights to existing block
+            for (const highlight of highlightBatch) {
+              const existingHighlights = (
+                await logseq.DB.datascriptQuery<BlockEntity[]>(
+                  `[:find (pull ?b [*])
+                          :where
+                            [?b :block/parent ?p]
+                            [?p :block/uuid ?u]
+                            [(str ?u) ?s]
+                            [(= ?s "${existingBlock.uuid}")]
+                            [?b :block/content ?c]
+                            [(= ?c "${highlight.content}")]]`
+                )
+              ).flat()
+              if (existingHighlights.length > 0) {
+                const existingHighlight = existingHighlights[0]
+                // update existing highlight
+                const noteChild = highlight.children?.[0]
+                if (noteChild) {
+                  const existingNotes = (
+                    await logseq.DB.datascriptQuery<BlockEntity[]>(
+                      `[:find (pull ?b [*])
+                              :where
+                                [?b :block/parent ?p]
+                                [?p :block/uuid ?u]
+                                [(str ?u) ?s]
+                                [(= ?s "${existingHighlight.uuid}")]
+                                [?b :block/content ?c]
+                                [(= ?c "${noteChild.content}")]]`
+                    )
+                  ).flat()
+                  if (existingNotes.length == 0) {
+                    // append new note
+                    await logseq.Editor.insertBlock(
+                      existingHighlight.uuid,
+                      noteChild.content,
+                      { sibling: false }
+                    )
+                  }
+                }
+              } else {
+                // append new highlight
+                await logseq.Editor.insertBatchBlock(
+                  existingBlock.uuid,
+                  highlight,
+                  { sibling: false }
+                )
+              }
+            }
+          }
+        }
 
-        articleBatch.unshift({
-          content,
-          children: highlightBatch,
-        })
+        isNewArticle &&
+          articleBatch.unshift({
+            content,
+            children: highlightBatch,
+          })
       }
 
       articleBatch.length > 0 &&

src/util.ts

@@ -1,4 +1,5 @@
 import { diff_match_patch } from 'diff-match-patch'
+import escape from 'markdown-escape'
 
 export interface GetArticleResponse {
   data: {
@@ -127,3 +128,12 @@ export const compareHighlightsInFile = (a: Highlight, b: Highlight): number => {
   // sort by top
   return highlightPointA.top - highlightPointB.top
 }
+
+export const markdownEscape = (text: string): string => {
+  try {
+    return escape(text)
+  } catch (e) {
+    console.error('markdownEscape error', e)
+    return text
+  }
+}

yarn.lock

@@ -1210,6 +1210,11 @@
   resolved "https://registry.yarnpkg.com/@types/diff-match-patch/-/diff-match-patch-1.0.32.tgz#d9c3b8c914aa8229485351db4865328337a3d09f"
   integrity sha512-bPYT5ECFiblzsVzyURaNhljBH2Gh1t9LowgUwciMrNAhFewLkHT2H0Mto07Y4/3KCOGZHRQll3CTtQZ0X11D/A==
 
+"@types/escape-latex@^0.1.30":
+  version "0.1.30"
+  resolved "https://registry.yarnpkg.com/@types/escape-latex/-/escape-latex-0.1.30.tgz#574f71a2716febffeb64a60a16c3a8c4804340fa"
+  integrity sha512-HRKSkPNGJuevkoDr8uuTRYUM9YIjEE9X7e7fP0l7uK6r1LUvnTFmYI2TrdSrZPrAPyoBUaq7KPC4c05204x0qQ==
+
 "@types/json-schema@^7.0.9":
   version "7.0.11"
   resolved "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz"
@@ -1220,6 +1225,11 @@
   resolved "https://registry.yarnpkg.com/@types/luxon/-/luxon-2.3.2.tgz#8a3f2cdd4858ce698b56cd8597d9243b8e9d3c65"
   integrity sha512-WOehptuhKIXukSUUkRgGbj2c997Uv/iUgYgII8U7XLJqq9W2oF0kQ6frEznRQbdurioz+L/cdaIm4GutTQfgmA==
 
+"@types/markdown-escape@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@types/markdown-escape/-/markdown-escape-1.1.0.tgz#8bd940d6701880eb7229467542c029bc05a7b22f"
+  integrity sha512-bJZh73L6fSt8MmTON/btR8hiKRipoIoPfLO41lxr6l65QXdG1rwUjR8Hu5xU7XYHBwKHiJZ+sTQ8L2TKkQrBpw==
+
 "@types/minimist@^1.2.0":
   version "1.2.2"
   resolved "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.2.tgz"
@@ -2122,6 +2132,11 @@ escalade@^3.1.1:
   resolved "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz"
   integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
 
+escape-latex@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/escape-latex/-/escape-latex-1.2.0.tgz#07c03818cf7dac250cce517f4fda1b001ef2bca1"
+  integrity sha512-nV5aVWW1K0wEiUIEdZ4erkGGH8mDxGyxSeqPzRNtWP7ataw+/olFObw7hujFWlVjNsaDFw5VZ5NzVSIqRgfTiw==
+
 escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"
@@ -3254,6 +3269,11 @@ map-obj@^4.0.0:
   resolved "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz"
   integrity sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==
 
+markdown-escape@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/markdown-escape/-/markdown-escape-1.1.0.tgz#228c932a47af251bb0a2d18d6001a235403777f2"
+  integrity sha512-f1+ARFbzLrBdC0Lj30uREn+zthrK/h1PO5UhN5IMDQvI2lSFn+8U06a5LHaxxYMhHD0mJoJ2BROJ/Sju5aw6+g==
+
 marked-terminal@^5.0.0:
   version "5.1.1"
   resolved "https://registry.npmjs.org/marked-terminal/-/marked-terminal-5.1.1.tgz"