From b1ed3daa3be7171fbabd5f8151ae32cdfa191dcf Mon Sep 17 00:00:00 2001
From: Diomede <diomede@mikamai.com>
Date: Sun, 23 May 2021 16:26:50 +0200
Subject: [PATCH] fix the folder exclusion logic

---
 package.json                | 4 +++-
 suggest/template-suggest.ts | 6 +++++-
 utils.ts                    | 3 ++-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 0f9d535..3235a2d 100644
--- a/package.json
+++ b/package.json
@@ -14,6 +14,7 @@
     "@rollup/plugin-commonjs": "^18.0.0",
     "@rollup/plugin-node-resolve": "^11.2.1",
     "@rollup/plugin-typescript": "^8.2.1",
+    "@types/lodash": "^4.14.170",
     "@types/node": "^14.14.37",
     "obsidian": "^0.12.0",
     "rollup": "^2.32.1",
@@ -21,6 +22,7 @@
     "typescript": "^4.2.4"
   },
   "dependencies": {
-    "liquidjs": "^9.25.0"
+    "liquidjs": "^9.25.0",
+    "lodash": "^4.17.21"
   }
 }
diff --git a/suggest/template-suggest.ts b/suggest/template-suggest.ts
index 48ee459..ff9a0c1 100644
--- a/suggest/template-suggest.ts
+++ b/suggest/template-suggest.ts
@@ -68,7 +68,11 @@ export default class TemplateSuggest extends CodeMirrorSuggest<ITemplateCompleti
   getTemplateSuggestions(inputStr: string): ITemplateCompletion[] {
     // find the list of files
     // TODO: filter before returning all the files
-    const templates = getTFilesFromFolder(this.app, this.plugin.settings.templatesFolder, this.plugin.settings.excludeFolders.split(','));
+    const {
+      templatesFolder,
+      excludeFolders
+    } = this.plugin.settings;
+    const templates = getTFilesFromFolder(this.app, templatesFolder, excludeFolders.split(','));
     return templates
       .map(file => ({ label: file.basename, file: file }))
       .filter((items) => items.label.toLowerCase().startsWith(inputStr));
diff --git a/utils.ts b/utils.ts
index ffcd07b..3428a82 100644
--- a/utils.ts
+++ b/utils.ts
@@ -1,4 +1,5 @@
 import { App, normalizePath, TAbstractFile, TFile, TFolder, Vault } from "obsidian";
+import { compact } from 'lodash';
 
 export function getTFilesFromFolder(app: App, folderName: string, subfoldersToExclude?: string[]): Array<TFile> {
   folderName = normalizePath(folderName);
@@ -6,7 +7,7 @@ export function getTFilesFromFolder(app: App, folderName: string, subfoldersToEx
   if (!folder) throw new Error(`${folderName} folder doesn't exist`);
   if (!(folder instanceof TFolder)) throw new Error(`${folderName} is a file, not a folder`);
 
-  const foldersToExclude = subfoldersToExclude
+  const foldersToExclude = subfoldersToExclude && compact(subfoldersToExclude).length > 0
     ? subfoldersToExclude.map(subfolder => [folderName,subfolder].join('/'))
     : [];