feat: inlude notes in the export

Closes #6
OGKevin · Sep 25, 2022 · af75dbf · af75dbf
1 parent 8ac0919
commit af75dbf
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 13 deletions.
diff --git a/manifest.json b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "obsidian-kobo-highlights-importer-plugin",
 	"name": "Kobo Highlights Importer",
-	"version": "1.2.0",
+	"version": "1.3.0-beta.1",
 	"minAppVersion": "0.15.9",
 	"description": "Import highlights from your Kobo device",
 	"author": "Kevin Hellemun",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "obsidian-kobo-highlights-importer-plugin",
-	"version": "1.2.0",
+	"version": "1.3.0-beta.1",
 	"description": "Import highlights from your Kobo device",
 	"main": "src/main.js",
 	"scripts": {

diff --git a/src/database/Highlight.test.ts b/src/database/Highlight.test.ts
@@ -55,9 +55,7 @@ describe('HighlightService', async function () {
 
 ## Chapter Eight: Holden
 
-“I guess I can’t be. How do you prove a negative?” - [[2022-08-05T20:46:41+00:00]]
-
-`
+> “I guess I can’t be. How do you prove a negative?” — [[2022-08-05T20:46:41+00:00]]`
         )
     });
 
@@ -85,9 +83,7 @@ describe('HighlightService', async function () {
 
 ## Chapter Eight: Holden
 
-“I guess I can’t be. How do you prove a negative?”
-
-`
+> “I guess I can’t be. How do you prove a negative?”`
         )
     });
 

diff --git a/src/database/Highlight.ts b/src/database/Highlight.ts
@@ -21,21 +21,29 @@ export class HighlightService {
             markdown += `\n\n`
         }
 
-        return markdown
+        return markdown.trim()
     }
 
-    convertToMap(arr: Highlight[], includeDate: boolean, dateFormat: string): Map<bookTitle, Map<chapter, highlight[]>> {
+    convertToMap(
+        arr: Highlight[],
+        includeDate: boolean,
+        dateFormat: string,
+    ): Map<bookTitle, Map<chapter, highlight[]>> {
         const m = new Map<string, Map<string, string[]>>()
 
         arr.forEach(x => {
             if (!x.content.bookTitle) {
                 throw new Error("bookTitle must be set")
             }
 
-            let text = x.bookmark.text
+            let text = `> ${x.bookmark.text}`
+
+            if (x.bookmark.note) {
+                text += `\n\n${x.bookmark.note}`
+            }
 
             if (includeDate) {
-                text = text + ` - [[${moment(x.bookmark.dateCreated).format(dateFormat)}]]`
+                text += ` — [[${moment(x.bookmark.dateCreated).format(dateFormat)}]]`
             }
 
             const existingBook = m.get(x.content.bookTitle)

diff --git a/versions.json b/versions.json
@@ -4,5 +4,6 @@
 	"1.0.2": "0.15.9",
 	"1.1.1": "0.15.9",
 	"1.2.0-beta.1": "0.15.9",
-	"1.2.0": "0.15.9"
+	"1.2.0": "0.15.9",
+	"1.3.0-beta.1": "0.15.9"
 }