Massive core refactoring + Tracking state indicator

manifest.json

@@ -1,11 +1,11 @@
 {
 	"id": "timethings",
 	"name": "Time Things",
-	"version": "1.3.0",
+	"version": "2.0.0",
 	"minAppVersion": "0.15.0",
-	"description": "Show clock in the corner. Track total editing time of a note and the last time it was modified.",
-	"author": "Nick Winters",
-	"authorUrl": "https://github.com/plasmabit",
-	"fundingUrl": "https://www.patreon.com/nickwinters",
+	"description": "Track total editing time of a note and the last time it was modified. Show clock and/or editing indicator in the corner",
+	"author": "Nick Winters, Rupel Rupelsson",
+	"authorUrl": "https://github.com/plasmabit, https://github.com/rupel190",
+	"fundingUrl": "https://www.patreon.com/nickwinters, https://ko-fi.com/rupel190",
 	"isDesktopOnly": true
 }

src/CAMS.ts

@@ -1,9 +1,5 @@
 import { Editor } from "obsidian";
 
-export function isLineIndented(line: string): boolean {
-	return /^[\s\t]/.test(line);
-}
-
 export function getLine(editor: Editor, fieldPath: string): number | undefined {
     const frontmatterLine = frontmatterEndLine(editor);
     const keys = fieldPath.split(".");
@@ -25,13 +21,10 @@ export function getLine(editor: Editor, fieldPath: string): number | undefined {
             if (currentFieldName === key) {
                 emergingPath.push(currentFieldName);
                 const targetPath = fieldPath.split(".");
-                const targetPathShrink = targetPath.slice(
-                    0,
-                    emergingPath.length,
-                );
+                const targetPathShrink = targetPath.slice(0, emergingPath.length);
                 if (
-                    (targetPathShrink.join(".") === emergingPath.join(".")) ===
-                    false
+                    (targetPathShrink.join(".") === emergingPath.join("."))
+                    === false
                 ) {
                     emergingPath.pop();
                     startLine = i + 1;
@@ -63,10 +56,31 @@ export function getLine(editor: Editor, fieldPath: string): number | undefined {
     return undefined;
 }
 
-export function isFrontmatterPresent(editor: Editor): boolean {
+export function setLine(editor: Editor, fieldPath: string, fieldValue: string,) {
+    // Check for frontmatter
+    if(!isFrontmatterPresent(editor)) {
+        // Create empty frontmatter
+        editor.setLine(0, "---\n---\n");
+    }
+    // Check for path
+    if(!fieldPathPresent(editor, fieldPath)) {
+        appendNewLine(editor, fieldPath, fieldValue);
+    } else {
+	    overrideCurrentLine(editor, fieldPath, fieldValue);
+    }
+}
+
+//#region private
+function isLineIndented(line: string): boolean {
+	return /^[\s\t]/.test(line);
+}
+
+
+function isFrontmatterPresent(editor: Editor): boolean {
 	if (editor.getLine(0) !== "---") {
 		return false;
 	}
+
 	for (let i = 1; i <= editor.lastLine(); i++) {
 		if (editor.getLine(i) === "---") {
 			return true;
@@ -75,7 +89,7 @@ export function isFrontmatterPresent(editor: Editor): boolean {
 	return false;
 }
 
-export function frontmatterEndLine(editor: Editor): number | undefined {
+function frontmatterEndLine(editor: Editor): number | undefined {
 	if (isFrontmatterPresent(editor)) {
 		for (let i = 1; i <= editor.lastLine(); i++) {
 			if (editor.getLine(i) === "---") {
@@ -86,14 +100,31 @@ export function frontmatterEndLine(editor: Editor): number | undefined {
 	return undefined; // # End line not found
 }
 
+function fieldPathPresent(editor: Editor, fieldPath: string): boolean {
+    const pathValue = getLine(editor, fieldPath)
+    if(pathValue) {
+        return true;
+    }
+    return false;
+}
 
-export function setValue(editor: Editor, fieldPath: string, fieldValue: string,) {
-	// The thing with this function is that it uses the format from settings to check against. I can make it as an argument that can be passed, or better yet, eradicate the check from the function to make it more atomic and place it somewhere else in the main code.
-	const fieldLine = getLine(editor, fieldPath);
-	if (fieldLine === undefined) {
-		return;
-	}
-	const initialLine = editor.getLine(fieldLine).split(":", 1);
-	const newLine = initialLine[0] + ": " + fieldValue;
-	editor.setLine(fieldLine, newLine);
+function appendNewLine(editor: Editor, fieldPath: string, fieldValue: string) {
+    const endLine = frontmatterEndLine(editor);
+    if(!endLine) {
+        console.log("No frontmatter endline found!");
+        return;
+    }
+    editor.setLine(endLine, fieldPath + ": " + fieldValue + "\n---");
+}
+
+function overrideCurrentLine(editor: Editor, fieldPath: string, fieldValue: string) {
+    const currentValue = getLine(editor, fieldPath);
+    if (currentValue === undefined) {
+        console.log("Value not found!");
+        return;
+    }
+    const initialLine = editor.getLine(currentValue).split(":", 1);
+    const newLine = initialLine[0] + ": " + fieldValue;
+    editor.setLine(currentValue, newLine);
 }
+//#endregion

src/gates.utils.ts

@@ -11,7 +11,7 @@ export interface FilterList {
 
 export function isFileMatchFilter(file: TFile, filter: FilterList,): boolean {
     // Check if file matches paths
-    if (isStringInList(file.parent.path, filter.folders)) {
+    if (file.parent && isStringInList(file.parent.path, filter.folders)) {
         return true;
     }
     // Check if file matches tags
@@ -27,7 +27,7 @@ export function isStringInList(path: string, list: string[]): boolean {
 export async function isTagPresentInFile(file: TFile, tag: string,) {
     await this.app.fileManager.processFrontMatter(
         file as TFile,
-        (frontmatter) => {
+        (frontmatter: any) => {
             const updateKeyValue = BOMS.getValue(frontmatter, "tags");
             if (updateKeyValue.includes(tag))
             {