From 40697da1aa7bce1485296e64dd12d737a8d00ca2 Mon Sep 17 00:00:00 2001 From: Abdallah Date: Wed, 6 Sep 2023 06:35:33 +0300 Subject: [PATCH 1/2] support adding metadata file in the same folder --- src/Generator.ts | 12 ++++++------ src/Setting.ts | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Generator.ts b/src/Generator.ts index cf97a77..5f7af9f 100644 --- a/src/Generator.ts +++ b/src/Generator.ts @@ -49,10 +49,10 @@ export class MetaDataGenerator { } async create(file: TFile) { - const metaDataFileName = this.uniquefyMetaDataFileName( - this.generateMetaDataFileName(file) - ); - const metaDataFilePath = `${this.plugin.settings.folder}/${metaDataFileName}`; + const metaDataFileName = this.generateMetaDataFileName(file) + const metaDataFileDirectory = this.plugin.settings.folder === "./" ? file.parent.path : this.plugin.settings.folder; + const uniqueMetaDataFileName = this.uniquefyMetaDataFileName(metaDataFileName, metaDataFileDirectory); + const metaDataFilePath = `${metaDataFileDirectory}/${uniqueMetaDataFileName}`; await this.createMetaDataFile(metaDataFilePath, file as TFile); } @@ -66,9 +66,9 @@ export class MetaDataGenerator { return metaDataFileName; } - private uniquefyMetaDataFileName(metaDataFileName: string): string { + private uniquefyMetaDataFileName(metaDataFileName: string, metaDataFileDirectory: string): string { const metaDataFilePath = normalizePath( - `${this.plugin.settings.folder}/${metaDataFileName}` + `${metaDataFileDirectory}/${metaDataFileName}` ); if (this.app.vault.getAbstractFileByPath(metaDataFilePath)) { return `CONFLICT-${moment().format( diff --git a/src/Setting.ts b/src/Setting.ts index 545b096..e2bd89f 100644 --- a/src/Setting.ts +++ b/src/Setting.ts @@ -48,7 +48,7 @@ export class BinaryFileManagerSettingTab extends PluginSettingTab { .setPlaceholder('Example: folder1/folder2') .setValue(this.plugin.settings.folder) .onChange((newFolder) => { - this.plugin.settings.folder = newFolder; + this.plugin.settings.folder = newFolder.trim(); this.plugin.saveSettings(); }); }); From 477fecaf9f55aeb381021a130f3b94dac5733894 Mon Sep 17 00:00:00 2001 From: Abdallah Date: Wed, 6 Sep 2023 06:52:57 +0300 Subject: [PATCH 2/2] update setting description --- src/Setting.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Setting.ts b/src/Setting.ts index e2bd89f..e13b9eb 100644 --- a/src/Setting.ts +++ b/src/Setting.ts @@ -41,7 +41,11 @@ export class BinaryFileManagerSettingTab extends PluginSettingTab { new Setting(containerEl) .setName('New file location') - .setDesc('New metadata file will be placed here') + .setDesc(createFragment(fragment => { + fragment.appendText('New metadata file will be placed here') + fragment.createEl("br") + fragment.appendText('Set to "./" to place in the same folder as the original file.') + })) .addSearch((component) => { new FolderSuggest(this.app, component.inputEl); component