Add parsing methods

Add block parsing

Update version numbers

Author: ruivieira

README.md

@@ -1,3 +1,15 @@
 # Obsidian LogSeq plugin
 
-A simple plugin to make Obsidian's preview of LogSeq markdown a bit more pleasant.
+A simple plugin to make Obsidian's preview of LogSeq markdown a bit more pleasant.
+
+## Setup
+
+Install the plugin from source or from the community list.
+
+This plugin doesn't support configuration at the moment.
+
+## Features
+
+- Preview of `org-mode` tasks (`TODO`, `DONE`, `COMPLETED`, etc.) with proper styling
+- Remove LogSeq timestamps from preview
+- Render `org-mode` blocks (eg `#+BEGIN_NOTE`/`#+END_NOTE`) as `<blockquote>`

main.js

@@ -5,6 +5,51 @@ import {
   Plugin,
 } from "obsidian";
 
+enum TaskType {
+  TODO,
+  DONE,
+  DOING,
+  LATER,
+  CANCELED,
+  UNKNOWN,
+}
+
+const VERSION = "0.0.2";
+
+function parseTaskType(content: string): TaskType | null {
+  if (content.startsWith("DONE ")) {
+    return TaskType.DONE;
+  } else if (content.startsWith("TODO ")) {
+    return TaskType.TODO;
+  } else if (content.startsWith("DOING ")) {
+    return TaskType.DOING;
+  } else if (content.startsWith("LATER ")) {
+    return TaskType.LATER;
+  } else if (content.startsWith("CANCELED ")) {
+    return TaskType.CANCELED;
+  } else {
+    return TaskType.UNKNOWN;
+  }
+}
+
+function removeTimestamps(content: string): string {
+  return content
+    .replace(/doing:: (?:\d{13})/gms, "")
+    .replace(/done:: (?:\d{13})/gms, "")
+    .replace(/todo:: (?:\d{13})/gms, "")
+    .replace(/doing:: (?:\d{13})/gms, "")
+    .replace(/later:: (?:\d{13})/gms, "")
+    .replace(/canceled:: (?:\d{13})/gms, "")
+    .replace(/collapsed:: (?:true|false)/gms, "")
+    .replace("<br>", "");
+}
+
+const blockTest = new RegExp(/\#\+BEGIN_(WARNING|IMPORTANT|QUOTE|CAUTION)/gms);
+
+function isBlock(content: string): boolean {
+  return blockTest.test(content);
+}
+
 export default class LogSeqPlugin extends Plugin {
   static postprocessor: MarkdownPostProcessor = (
     el: HTMLElement,
@@ -13,43 +58,57 @@ export default class LogSeqPlugin extends Plugin {
     const entries = el.querySelectorAll("li[data-line]");
 
     entries.forEach((entry) => {
-      const contents = entry.textContent;
-      if (contents.startsWith("DONE")) {
-        const replacedHTML = entry.innerHTML
-          .replace("DONE", "")
-          .replace(/doing:: (?:\d{13})/, "")
-          .replace(/done:: (?:\d{13})/, "")
-          .replace(/todo:: (?:\d{13})/, "")
-          .replace("<br>", "");
-        entry.innerHTML = `<span class="logseq-done-task"><input type="checkbox" checked> ${replacedHTML}</span>`;
-      } else if (contents.startsWith("TODO")) {
-        const replacedHTML = entry.innerHTML
-          .replace("TODO", "")
-          .replace(/todo:: (?:\d{13})/, "");
+      const taskType = parseTaskType(entry.textContent);
 
-        entry.innerHTML = `<input type="checkbox"> <span class="logseq-status-task">TODO</span> ${replacedHTML}`;
-      } else if (contents.startsWith("DOING")) {
-        const replacedHTML = entry.innerHTML
-          .replace("DOING", "")
-          .replace(/doing:: (?:\d{13})/, "")
-          .replace(/todo:: (?:\d{13})/, "");
+      // Check if the entry is a org-mode block
+      if (isBlock(entry.innerHTML)) {
+        let replacedBlock = entry.innerHTML.replace(
+          /\#\+BEGIN_(WARNING|IMPORTANT|QUOTE|CAUTION)/,
+          "<blockquote> &#9759;"
+        );
+        replacedBlock = replacedBlock.replace(
+          /\#\+END_(WARNING|IMPORTANT|QUOTE|CAUTION)/,
+          "</blockquote>"
+        );
+        entry.innerHTML = replacedBlock;
+      }
 
+      if (taskType == TaskType.DONE) {
+        const replacedHTML = removeTimestamps(
+          entry.innerHTML.replace("DONE", "")
+        );
+        entry.innerHTML = `<span class="logseq-done-task"><input type="checkbox" checked> ${replacedHTML}</span>`;
+      } else if (taskType == TaskType.TODO) {
+        const replacedHTML = removeTimestamps(
+          entry.innerHTML.replace("TODO", "")
+        );
+        entry.innerHTML = `<input type="checkbox"> <span class="logseq-status-task">TODO</span> ${replacedHTML}`;
+      } else if (taskType == TaskType.DOING) {
+        const replacedHTML = removeTimestamps(
+          entry.innerHTML.replace("DOING", "")
+        );
         entry.innerHTML = `<input type="checkbox"> <span class="logseq-status-task">DOING</span> ${replacedHTML}`;
-      } else if (contents.startsWith("LATER")) {
-        const replacedHTML = entry.innerHTML.replace("LATER", "");
-
+      } else if (taskType == TaskType.LATER) {
+        const replacedHTML = removeTimestamps(
+          entry.innerHTML.replace("LATER", "")
+        );
         entry.innerHTML = `<input type="checkbox"> <span class="logseq-status-task">LATER</span> ${replacedHTML}`;
+      } else if (taskType == TaskType.CANCELED) {
+        const replacedHTML = removeTimestamps(
+          entry.innerHTML.replace("CANCELED", "")
+        );
+        entry.innerHTML = `<span class="logseq-done-task">${replacedHTML}</span>`;
       }
     });
   };
 
   onload() {
-    console.log("loading LogSeq plugin");
+    console.log(`Loading LogSeq plugin ${VERSION}`);
     MarkdownPreviewRenderer.registerPostProcessor(LogSeqPlugin.postprocessor);
   }
 
   onunload() {
-    console.log("unloading LogSeq plugin");
+    console.log(`unloading LogSeq plugin ${VERSION}`);
     MarkdownPreviewRenderer.unregisterPostProcessor(LogSeqPlugin.postprocessor);
   }
 }

main.ts

@@ -1,7 +1,7 @@
 {
 	"id": "logseq-format",
 	"name": "LogSeq markdown formatting",
-	"version": "0.0.1",
+	"version": "0.0.2",
 	"minAppVersion": "0.9.15",
 	"description": "Render LogSeq-specific markdown",
 	"author": "Rui Vieira",

manifest.json

@@ -1,6 +1,6 @@
 {
   "name": "obsidian-plugin-logseq",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "description": "Render LogSeq-specific markdown.",
   "main": "main.js",
   "scripts": {

package.json

@@ -1,6 +1,4 @@
 {
-	"1.0.0": "0.9.15",
-	"1.0.1": "0.9.15",
-	"1.0.2": "0.9.15",
-	"1.0.3": "0.9.15"
+	"0.0.1": "0.9.15",
+	"0.0.2": "0.9.15"
 }