Small fixes (#30)

chhoumann · web-flow · commit ca2956bad60d · 2021-06-24T08:46:48.000+02:00
diff --git a/manifest.json b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "quickadd",
 	"name": "QuickAdd",
-	"version": "0.2.8",
+	"version": "0.2.9",
 	"minAppVersion": "0.12.00",
 	"description": "Quickly add new pages or content to your vault.",
 	"author": "Christian B. B. Houmann",
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "quickadd",
-  "version": "0.2.8",
+  "version": "0.2.9",
   "description": "Quickly add new pages or content to your vault.",
   "main": "main.js",
   "scripts": {
diff --git a/src/engine/CaptureChoiceEngine.ts b/src/engine/CaptureChoiceEngine.ts
@@ -2,8 +2,8 @@ import type ICaptureChoice from "../types/choices/ICaptureChoice";
 import type {App, TFile} from "obsidian";
 import {log} from "../logger/logManager";
 import {CaptureChoiceFormatter} from "../formatters/captureChoiceFormatter";
-import {appendToCurrentLine} from "../utility";
-import {MARKDOWN_FILE_EXTENSION_REGEX, VALUE_SYNTAX} from "../constants";
+import {appendToCurrentLine, replaceTemplaterTemplatesInCreatedFile} from "../utility";
+import {VALUE_SYNTAX} from "../constants";
 import type QuickAdd from "../main";
 import {QuickAddChoiceEngine} from "./QuickAddChoiceEngine";
 import {SingleTemplateEngine} from "./SingleTemplateEngine";
@@ -51,14 +51,13 @@ export class CaptureChoiceEngine extends QuickAddChoiceEngine {
                     new SingleTemplateEngine(this.app, this.plugin, this.choice.createFileIfItDoesntExist.template, this.choiceExecutor);
 
                 const fileContent: string = await singleTemplateEngine.run();
-                file = await this.createFileWithInput(filePath, fileContent);
-                if (!file) {
-                    log.logError(`could not create '${filePath}.'`);
-                    return;
-                }
+                const file: TFile = await this.createFileWithInput(filePath, fileContent);
+                await replaceTemplaterTemplatesInCreatedFile(this.app, file);
 
-                const newFileContent: string = await this.formatter.formatContentWithFile(content, this.choice, fileContent, file);
+                const updatedFileContent: string = await this.app.vault.cachedRead(file);
+                const newFileContent: string = await this.formatter.formatContentWithFile(content, this.choice, updatedFileContent, file);
                 await this.app.vault.modify(file, newFileContent);
+
             } else {
                 const formattedContent = await this.formatter.formatContent(content, this.choice);
                 if (!formattedContent) return;
@@ -106,6 +105,19 @@ export class CaptureChoiceEngine extends QuickAddChoiceEngine {
         }
 
         if (!content) return;
-        appendToCurrentLine(content, this.app);
+
+        if (this.choice.prepend) {
+            const activeFile: TFile = this.app.workspace.getActiveFile();
+            if (!activeFile) {
+                log.logError("Cannot capture to active file - no active file.")
+            }
+
+            const fileContent: string = await this.app.vault.cachedRead(activeFile);
+            const newFileContent: string = `${fileContent}${content}`
+
+            await this.app.vault.modify(activeFile, newFileContent);
+        } else {
+            appendToCurrentLine(content, this.app);
+        }
     }
 }
diff --git a/src/engine/MacroChoiceEngine.ts b/src/engine/MacroChoiceEngine.ts
@@ -39,7 +39,7 @@ export class MacroChoiceEngine extends QuickAddChoiceEngine {
     }
 
     async run(): Promise<void> {
-        const macroId: string = this.choice.macroId ?? this.choice.macro.id;
+        const macroId: string = this.choice.macroId ?? this.choice?.macro?.id;
         const macro: IMacro = this.macros.find(m => m.id === macroId);
 
         await this.executeCommands(macro.commands);
diff --git a/src/engine/SingleTemplateEngine.ts b/src/engine/SingleTemplateEngine.ts
@@ -15,10 +15,6 @@ export class SingleTemplateEngine extends TemplateEngine {
 
         templateContent = await this.formatter.formatFileContent(templateContent);
 
-        if (this.templater) {
-            templateContent = this.templater.templater.parser.parseTemplates(templateContent);
-        }
-
         return templateContent;
     }
 }
diff --git a/src/engine/TemplateEngine.ts b/src/engine/TemplateEngine.ts
@@ -2,7 +2,7 @@ import {QuickAddEngine} from "./QuickAddEngine";
 import {CompleteFormatter} from "../formatters/completeFormatter";
 import {App, TAbstractFile, TFile} from "obsidian";
 import type QuickAdd from "../main";
-import {getTemplater} from "../utility";
+import {getTemplater, replaceTemplaterTemplatesInCreatedFile} from "../utility";
 import GenericSuggester from "../gui/GenericSuggester/genericSuggester";
 import {FILE_NUMBER_REGEX} from "../constants";
 import {log} from "../logger/logManager";
@@ -18,7 +18,7 @@ export abstract class TemplateEngine extends QuickAddEngine {
         this.formatter = new CompleteFormatter(app, plugin, choiceFormatter);
     }
 
-    public abstract run(): Promise<void> | Promise<string>;
+    public abstract run(): Promise<void> | Promise<string> | Promise<{file: TFile, content: string}>;
 
     protected async getOrCreateFolder(folders: string[]): Promise<string> {
         let folderPath: string;
@@ -71,9 +71,7 @@ export abstract class TemplateEngine extends QuickAddEngine {
             const formattedTemplateContent: string = await this.formatter.formatFileContent(templateContent);
             const createdFile: TFile = await this.app.vault.create(filePath, formattedTemplateContent);
 
-            if (this.templater && !this.templater?.settings["trigger_on_file_creation"]) {
-                await this.templater.templater.overwrite_file_templates(createdFile);
-            }
+            await replaceTemplaterTemplatesInCreatedFile(this.app, createdFile);
 
             return createdFile;
         }
diff --git a/src/formatters/completeFormatter.ts b/src/formatters/completeFormatter.ts
@@ -1,6 +1,5 @@
 import {Formatter} from "./formatter";
 import type {App, TFile} from "obsidian";
-import {MARKDOWN_FILE_EXTENSION_REGEX} from "../constants";
 import {getNaturalLanguageDates} from "../utility";
 import GenericInputPrompt from "../gui/GenericInputPrompt/genericInputPrompt";
 import GenericSuggester from "../gui/GenericSuggester/genericSuggester";
diff --git a/src/gui/ChoiceBuilder/captureChoiceBuilder.ts b/src/gui/ChoiceBuilder/captureChoiceBuilder.ts
@@ -32,9 +32,9 @@ export class CaptureChoiceBuilder extends ChoiceBuilder {
         }
 
         this.addTaskSetting();
+        this.addPrependSetting();
 
         if (!this.choice.captureToActiveFile) {
-            this.addPrependSetting();
             this.addAppendLinkSetting();
             this.addInsertAfterSetting();
         }
@@ -88,7 +88,7 @@ export class CaptureChoiceBuilder extends ChoiceBuilder {
     private addPrependSetting() {
         const prependSetting: Setting = new Setting(this.contentEl);
         prependSetting.setName("Write to bottom of file")
-            .setDesc("Put value at the bottom of the file - otherwise at the top.")
+            .setDesc(`Put value at the bottom of the file - otherwise at the ${this.choice?.captureToActiveFile ? "active cursor location" : "top"}.`)
             .addToggle(toggle => {
                 toggle.setValue(this.choice.prepend);
                 toggle.onChange(value => this.choice.prepend = value);
diff --git a/src/gui/choiceList/ChoiceView.svelte b/src/gui/choiceList/ChoiceView.svelte
@@ -97,11 +97,15 @@
     }
 
     function updateChoiceHelper(oldChoice: IChoice, newChoice: IChoice) {
-        if (oldChoice.id === newChoice.id)
-                return newChoice;
+        if (oldChoice.id === newChoice.id) {
+            oldChoice = {...oldChoice, ...newChoice};
+            return oldChoice;
+        }
 
         if (oldChoice.type === ChoiceType.Multi) {
-            (oldChoice as IMultiChoice).choices.map(c => updateChoiceHelper(c, newChoice))
+            const multiChoice = (oldChoice as IMultiChoice);
+            const multiChoiceChoices = multiChoice.choices.map(c => updateChoiceHelper(c, newChoice))
+            return {...multiChoice, choices: multiChoiceChoices} as IChoice;
         }
 
         return oldChoice;
diff --git a/src/main.ts b/src/main.ts
@@ -92,8 +92,10 @@ export default class QuickAdd extends Plugin {
 	private async convertMacroChoicesMacroToId() {
 	    function convertMacroChoiceMacroToIdHelper(choice: IChoice): IChoice {
 	    	if (choice.type === ChoiceType.Multi) {
-	    		 (choice as IMultiChoice).choices.map(convertMacroChoiceMacroToIdHelper);
-	    		 return choice;
+	    		let multiChoice = (choice as IMultiChoice);
+	    		const multiChoices = multiChoice.choices.map(convertMacroChoiceMacroToIdHelper);
+	    		multiChoice = {...multiChoice, choices: multiChoices};
+	    		return multiChoice;
 	    	}
 
 			if (choice.type !== ChoiceType.Macro) return choice;
diff --git a/src/types/choices/ICaptureChoice.ts b/src/types/choices/ICaptureChoice.ts
@@ -5,6 +5,7 @@ export default interface ICaptureChoice extends IChoice {
     captureToActiveFile: boolean;
     createFileIfItDoesntExist: {enabled: boolean, createWithTemplate: boolean, template: string};
     format: { enabled: boolean, format: string };
+    /** Capture to bottom of file (after current file content). */
     prepend: boolean;
     appendLink: boolean;
     task: boolean;
diff --git a/src/utility.ts b/src/utility.ts
@@ -1,4 +1,4 @@
-import type {App} from "obsidian";
+import type {App, TFile} from "obsidian";
 import {MarkdownView, TFolder} from "obsidian";
 import {log} from "./logger/logManager";
 
@@ -7,6 +7,14 @@ export function getTemplater(app: App) {
     return app.plugins.plugins["templater-obsidian"]
 }
 
+export async function replaceTemplaterTemplatesInCreatedFile(app: App, file: TFile) {
+    const templater = getTemplater(app);
+
+    if (templater && !templater?.settings["trigger_on_file_creation"]) {
+        await templater.templater.overwrite_file_templates(file);
+    }
+}
+
 export function getTemplatesFolderPath(app: App): string {
     let path: string = "";
     // @ts-ignore
diff --git a/versions.json b/versions.json
@@ -1,3 +1,3 @@
 {
-	"0.2.8": "0.12.4"
+	"0.2.9": "0.12.4"
 }

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"id": "quickadd",`
`3`	`3`	`"name": "QuickAdd",`
`4`		`- "version": "0.2.8",`
	`4`	`+ "version": "0.2.9",`
`5`	`5`	`"minAppVersion": "0.12.00",`
`6`	`6`	`"description": "Quickly add new pages or content to your vault.",`
`7`	`7`	`"author": "Christian B. B. Houmann",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "quickadd",`
`3`		`- "version": "0.2.8",`
	`3`	`+ "version": "0.2.9",`
`4`	`4`	`"description": "Quickly add new pages or content to your vault.",`
`5`	`5`	`"main": "main.js",`
`6`	`6`	`"scripts": {`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ export class MacroChoiceEngine extends QuickAddChoiceEngine {`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`async run(): Promise<void> {`
`42`		`- const macroId: string = this.choice.macroId ?? this.choice.macro.id;`
	`42`	`+ const macroId: string = this.choice.macroId ?? this.choice?.macro?.id;`
`43`	`43`	`const macro: IMacro = this.macros.find(m => m.id === macroId);`
`44`	`44`
`45`	`45`	`await this.executeCommands(macro.commands);`
Original file line number	Diff line number	Diff line change
`@@ -15,10 +15,6 @@ export class SingleTemplateEngine extends TemplateEngine {`
`15`	`15`
`16`	`16`	`templateContent = await this.formatter.formatFileContent(templateContent);`
`17`	`17`
`18`		`- if (this.templater) {`
`19`		`- templateContent = this.templater.templater.parser.parseTemplates(templateContent);`
`20`		`- }`
`21`		`-`
`22`	`18`	`return templateContent;`
`23`	`19`	`}`
`24`	`20`	`}`