fix: update tasks after filter update

ivan-lednev · Oct 13, 2023 · 25a50c4 · 25a50c4
1 parent b2a1f16
commit 25a50c4
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 3 deletions.
diff --git a/src/main.ts b/src/main.ts
@@ -1,7 +1,14 @@
 import { FileView, Plugin, WorkspaceLeaf } from "obsidian";
 import { getDateFromFile } from "obsidian-daily-notes-interface";
 import { DataArray, getAPI, STask } from "obsidian-dataview";
-import { get, readable, Readable, writable, Writable } from "svelte/store";
+import {
+  derived,
+  get,
+  readable,
+  Readable,
+  writable,
+  Writable,
+} from "svelte/store";
 
 import { obsidianContext, viewTypeTimeline, viewTypeWeekly } from "./constants";
 import { settings } from "./global-store/settings";
@@ -95,9 +102,18 @@ export default class DayPlanner extends Plugin {
       );
       document.addEventListener("keydown", delayUpdateTasks);
 
+      const source = derived(this.settingsStore, ($settings) => {
+        return $settings.dataviewSource;
+      });
+
+      const unsubscribeFromSettings = source.subscribe(() => {
+        updateTasks();
+      });
+
       return () => {
         this.app.metadataCache.off("dataview:metadata-change", updateTasks);
         document.removeEventListener("keydown", delayUpdateTasks);
+        unsubscribeFromSettings();
       };
     });
   }

diff --git a/src/regexp.ts b/src/regexp.ts
@@ -14,6 +14,7 @@ const hourMinuteSeparator = `[:. ]`;
 const time = `(${hours})(?:${hourMinuteSeparator}?(${minutes}))?\\s*([apAP][mM])?`;
 
 export const timeRegExp = new RegExp(time);
+export const timeFromStartRegExp = new RegExp(`^${time}`);
 export const timestampRegExp = new RegExp(
   `^(?<listTokens>${listToken}${checkboxOrNothing})(?<times>(?<start>${time})(?:${durationSeparator}(?<end>${time}))?)(?<text>.+)$`,
   "im",

diff --git a/src/util/get-tasks-for-day.ts b/src/util/get-tasks-for-day.ts
@@ -2,7 +2,7 @@ import { Moment } from "moment/moment";
 import { getAllDailyNotes, getDailyNote } from "obsidian-daily-notes-interface";
 import { DataArray, STask } from "obsidian-dataview";
 
-import { timeRegExp } from "../regexp";
+import { timeFromStartRegExp } from "../regexp";
 import { sTaskToPlanItem } from "../service/dataview-facade";
 import { PlanItem } from "../types";
 
@@ -15,7 +15,7 @@ export function getTasksForDay(day: Moment, dataviewTasks: DataArray<STask>) {
 
   return dataviewTasks
     .where((task: STask) => {
-      const timeIsSet = timeRegExp.test(task.text);
+      const timeIsSet = timeFromStartRegExp.test(task.text);
 
       if (!timeIsSet) {
         return false;