fix: cannot parse

benjypng · Oct 18, 2023 · 6dcf35d · 6dcf35d
1 parent b6b32d5
commit 6dcf35d
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 33 deletions.
diff --git a/src/index.tsx b/src/index.tsx
@@ -2,48 +2,18 @@ import "@logseq/libs";
 import { settings } from "~/settings";
 import { goToDate } from "~/features/go-to-date";
 import { completeTask } from "~/features/complete-task";
-import { handlePopup } from "~/utils";
+import { handlePopup, setSettings } from "~/utils";
 import { parseMutationObserver } from "~/features/parse/semi-auto";
 import { manualParsing } from "~/features/parse/manual";
-import { PluginSettings } from "./settings/types";
 
 const main = async () => {
   console.info("logseq-datenlp-plugin loaded");
+  setSettings();
 
   handlePopup();
 
   logseq.App.onCurrentGraphChanged(async () => {
-    const { dateChar, scheduledChar, deadlineChar } =
-      logseq.settings! as Partial<PluginSettings>;
-
-    // Check if the above has equivalence
-    if (
-      dateChar === scheduledChar ||
-      dateChar === deadlineChar ||
-      scheduledChar === deadlineChar
-    ) {
-      // Reset settings if the special chars have equivalence
-      logseq.updateSettings({
-        dateChar: "@",
-        scheduledChar: "%",
-        deadlineChar: "^",
-      });
-      await logseq.UI.showMsg(
-        "There are overlapping characters for the inline parsing character. Please re-check your settings",
-        "error",
-      );
-      return;
-    }
-
-    window.setTimeout(async () => {
-      //Save user configs in settings;
-      const preferredDateFormat: string = (await logseq.App.getUserConfigs())
-        .preferredDateFormat;
-      logseq.updateSettings({ preferredDateFormat: preferredDateFormat });
-      console.info(
-        `logseq-datenlp-plugin: Settings updated to ${preferredDateFormat}`,
-      );
-    }, 1500);
+    setSettings();
   });
 
   goToDate();

diff --git a/src/utils/index.ts b/src/utils/index.ts
@@ -11,3 +11,37 @@ export const handlePopup = () => {
     false,
   );
 };
+
+export const setSettings = async () => {
+  if (!logseq.settings) return;
+  const { dateChar, scheduledChar, deadlineChar } = logseq.settings;
+
+  // Check if the above has equivalence
+  if (
+    dateChar === scheduledChar ||
+    dateChar === deadlineChar ||
+    scheduledChar === deadlineChar
+  ) {
+    // Reset settings if the special chars have equivalence
+    logseq.updateSettings({
+      dateChar: "@",
+      scheduledChar: "%",
+      deadlineChar: "^",
+    });
+    await logseq.UI.showMsg(
+      "There are overlapping characters for the inline parsing character. Please re-check your settings",
+      "error",
+    );
+    return;
+  }
+
+  window.setTimeout(async () => {
+    //Save user configs in settings;
+    const preferredDateFormat: string = (await logseq.App.getUserConfigs())
+      .preferredDateFormat;
+    logseq.updateSettings({ preferredDateFormat: preferredDateFormat });
+    console.info(
+      `logseq-datenlp-plugin: Settings updated to ${preferredDateFormat}`,
+    );
+  }, 1500);
+};