Fixes #9. Add URI to vault and note to the calendar event location fi…

…eld.
andrewbrereton · Nov 11, 2023 · ad2bd14 · ad2bd14
1 parent 838736d
commit ad2bd14
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/src/IcalService.ts b/src/IcalService.ts
@@ -53,6 +53,7 @@ export class IcalService {
 
     event += '' +
       'SUMMARY:' + task.getSummary() + '\r\n' +
+      'LOCATION:ALTREP="' + task.getLocation() + '":' + task.getLocation() + '\r\n' +
       'END:VEVENT\r\n';
 
       return event;

diff --git a/src/Model/Task.ts b/src/Model/Task.ts
@@ -7,15 +7,18 @@ export class Task {
   public status: TaskStatus;
   dates: TaskDate[];
   public summary: string;
+  fileUri: string;
 
   constructor(
     status: TaskStatus,
     dates: TaskDate[],
-    summary: string
+    summary: string,
+    fileUri: string
   ) {
     this.status = status;
     this.dates = dates;
     this.summary = summary;
+    this.fileUri = fileUri;
   }
 
   public getId(): string {
@@ -54,9 +57,13 @@ export class Task {
 
     return `${emoji} ${summary}`;
   }
+
+  public getLocation(): string {
+    return this.fileUri;
+  }
 }
 
-export function createTaskFromLine(line: string): Task|null {
+export function createTaskFromLine(line: string, fileUri: string): Task|null {
   const taskRegExp = /(\*|-)\s*(?<taskStatus>\[.?])\s*(?<summary>.*)\s*/gi;
   const dateRegExp = /\b(?<year>\d{4})-(?<month>\d{2})-(?<day>\d{1,2})\b/gi;
 
@@ -79,5 +86,5 @@ export function createTaskFromLine(line: string): Task|null {
   const taskDates = getTaskDatesFromMarkdown(line);
   const summary = getSummaryFromMarkdown(taskMatch?.groups?.summary ?? '');
 
-  return new Task(taskStatus, taskDates, summary);
+  return new Task(taskStatus, taskDates, summary, fileUri);
 }
diff --git a/src/Model/TaskDate.ts b/src/Model/TaskDate.ts
@@ -70,7 +70,7 @@ export function getTaskDatesFromMarkdown(markdown: string): TaskDate[] {
 }
 
 export function getSummaryFromMarkdown(markdown: string): string {
-  const recurringRegExp = /🔁.*\s+[➕|⏳|🛫|📅|✅]?/gi;
+  const recurringRegExp = /🔁(.*?)(?=\s(?:➕|⏳|🛫|📅|✅)|\s\d{4}-\d{2}-\d{2}|$)/gi;
   const emojiDateRegExp = /\s*➕|⏳|🛫|📅|✅\s?\d{4}-\d{2}-\d{1,2}\s*/gi;
   const dateRegExp = /\s*\d{4}-\d{2}-\d{1,2}/gi;
 

diff --git a/src/TaskFinder.ts b/src/TaskFinder.ts
@@ -11,14 +11,15 @@ export class TaskFinder {
   async findTasks(file: TFile, listItemsCache: ListItemCache[]): Promise<Task[]> {
     const fileCachedContent: string = await this.vault.cachedRead(file);
     const lines: string[] = fileCachedContent.split('\n');
+    const fileUri: string = 'obsidian://open?vault=' + file.vault.getName() + '&file=' + file.path;
 
     const tasks: Task[] = listItemsCache
         // Get the position of each list item
         .map((listItemCache: ListItemCache) => listItemCache.position.start.line)
         // Get the line
         .map((idx) => lines[idx])
         // Create a Task from the line
-        .map((line: string) => createTaskFromLine(line))
+        .map((line: string) => createTaskFromLine(line, fileUri))
         // Filter out the nulls
         .filter((task: Task | null) => task !== null) as Task[]
         ;