From 3b44baf363474b3141d68d53bdb7c3c782d359b5 Mon Sep 17 00:00:00 2001
From: vorotamoroz <vrtmrz@gmail.com>
Date: Tue, 22 Nov 2022 18:03:37 +0900
Subject: [PATCH] Fixed: - Nested tags are now displayed correctly. - Even if
 multiple tags are simplified to one level, they can be displayed correctly
 too.

New feature:
- We can keep empty folders, even if they can be simplified.
---
 TreeItemComponent.svelte | 19 ++++++++++++++-----
 main.ts                  | 23 +++++++++++++++++++----
 store.ts                 |  3 ++-
 types.ts                 |  2 ++
 util.ts                  | 10 ++++++----
 5 files changed, 43 insertions(+), 14 deletions(-)

diff --git a/TreeItemComponent.svelte b/TreeItemComponent.svelte
index 3efb7e4..29b6fc0 100644
--- a/TreeItemComponent.svelte
+++ b/TreeItemComponent.svelte
@@ -1,10 +1,12 @@
 <script lang="ts">
-	import { currentFile, maxDepth, tagInfo } from "./store";
+	import { currentFile, maxDepth, tagInfo, tagFolderSetting } from "./store";
 	import {
 		TreeItem,
 		TagFolderItem,
 		SUBTREE_MARK_REGEX,
 		SUBTREE_MARK,
+		TagFolderSettings,
+		DEFAULT_SETTINGS,
 	} from "./types";
 	import { isAutoExpandTree, omittedTags, renderSpecialTag } from "./util";
 	import type { TagInfoDict } from "./types";
@@ -45,6 +47,12 @@
 		.split("/").length;
 	let _maxDepth = currentDepth + 1;
 
+	let setting: TagFolderSettings = JSON.parse(
+		JSON.stringify(DEFAULT_SETTINGS)
+	);
+	tagFolderSetting.subscribe((newSetting) => {
+		setting = newSetting;
+	});
 	function toggleFolder(evt: MouseEvent, entry: TagFolderItem) {
 		if (
 			evt.target instanceof HTMLElement &&
@@ -136,8 +144,8 @@
 		ellipsisMark = "";
 		omitTags = [];
 		if ("tag" in entry) {
-			showOnlyChildren = isAutoExpandTree(entry);
-			const omitTag = omittedTags(entry);
+			showOnlyChildren = isAutoExpandTree(entry, setting);
+			const omitTag = omittedTags(entry, setting);
 			if (omitTag !== false) {
 				omitTags = [
 					...omitTag.map((e) =>
@@ -147,7 +155,8 @@
 							.join("/")
 					),
 				];
-				ellipsisMark = "/" + omitTags.join("/");
+				ellipsisMark =
+					" " + omitTags.join(" ").replace(/\//g, SUBTREE_MARK);
 			}
 		}
 	}
@@ -158,7 +167,7 @@
 			? `${
 					skippedTag
 						? `${skippedTag}${
-								entry.tag.startsWith(SUBTREE_MARK) ? " " : "/"
+								entry.tag.startsWith(SUBTREE_MARK) ? " " : " "
 						  }`
 						: ""
 			  }${tagMark}${convertedTag}`
diff --git a/main.ts b/main.ts
index 04c4e95..2f2ee68 100644
--- a/main.ts
+++ b/main.ts
@@ -34,7 +34,7 @@ import {
 	DEFAULT_SETTINGS,
 	VIEW_TYPE_SCROLL
 } from "types";
-import { treeRoot, currentFile, maxDepth, tagInfo } from "store";
+import { treeRoot, currentFile, maxDepth, tagInfo, tagFolderSetting } from "store";
 import { ancestorToLongestTag, ancestorToTags, doEvents, isAutoExpandTree, isSpecialTag, omittedTags, renderSpecialTag, secondsToFreshness } from "./util";
 import { ScrollView } from "./ScrollView";
 
@@ -249,7 +249,7 @@ class TagFolderView extends ItemView {
 		const entryPath = "tag" in entry ? [...ancestorToTags(entry.ancestors)] : ['root', ...entry.tags];
 
 		if ("tag" in entry) {
-			const oTags = omittedTags(entry);
+			const oTags = omittedTags(entry, this.plugin.settings);
 			if (oTags != false) {
 				entryPath.push(...oTags);
 			}
@@ -823,7 +823,7 @@ export default class TagFolderPlugin extends Plugin {
 		}
 		if ("tag" in entry) {
 			if (path.indexOf(entry.tag) !== -1) return;
-			if (omittedTags(entry)) return;
+			if (omittedTags(entry, this.settings)) return;
 			const key = entry.ancestors.join("/");
 			for (const tags of this.expandedFolders) {
 				const tagPrefixToOpen = [];
@@ -844,7 +844,7 @@ export default class TagFolderPlugin extends Plugin {
 
 						for (const child of entry.children) {
 							if ("tag" in child) {
-								const autoExp = isAutoExpandTree(child);
+								const autoExp = isAutoExpandTree(child, this.settings);
 								const nextDepth = autoExp ? maxDepth : maxDepth - 1;
 								if (path.indexOf(child.tag) == -1) {
 									await this.expandLastExpandedFolders(child, false, [...path, entry.tag], openedTags, nextDepth);
@@ -1481,6 +1481,7 @@ ${this.tagInfoBody}`;
 			await this.loadData()
 		);
 		await this.loadTagInfo();
+		tagFolderSetting.set(this.settings);
 		this.compareItems = getCompareMethodItems(this.settings);
 		this.compareTags = getCompareMethodTags(this.settings);
 	}
@@ -1488,6 +1489,7 @@ ${this.tagInfoBody}`;
 	async saveSettings() {
 		await this.saveData(this.settings);
 		await this.saveTagInfo();
+		tagFolderSetting.set(this.settings);
 		this.compareItems = getCompareMethodItems(this.settings);
 		this.compareTags = getCompareMethodTags(this.settings);
 	}
@@ -1605,6 +1607,19 @@ class TagFolderSettingTab extends PluginSettingTab {
 						await this.plugin.saveSettings();
 					});
 			});
+		new Setting(containerEl)
+			.setName("Do not simplify empty folders")
+			.setDesc(
+				"Keep empty folders, even if they can be simplified."
+			)
+			.addToggle((toggle) => {
+				toggle
+					.setValue(this.plugin.settings.doNotSimplifyTags)
+					.onChange(async (value) => {
+						this.plugin.settings.doNotSimplifyTags = value;
+						await this.plugin.saveSettings();
+					});
+			});
 		const setOrderMethod = async (key: string, order: string) => {
 			const oldSetting = this.plugin.settings.sortType.split("_");
 			if (!key) key = oldSetting[0];
diff --git a/store.ts b/store.ts
index 51dd9b4..16aec9d 100644
--- a/store.ts
+++ b/store.ts
@@ -1,5 +1,5 @@
 import { writable } from "svelte/store";
-import { TagInfoDict, TreeItem } from "types";
+import { DEFAULT_SETTINGS, TagFolderSettings, TagInfoDict, TreeItem } from "types";
 
 export const treeRoot = writable<TreeItem>();
 export const currentFile = writable<string>("");
@@ -9,3 +9,4 @@ export const maxDepth = writable<number>(0);
 export const filterString = writable<string>("");
 export const tagInfo = writable<TagInfoDict>({});
 
+export const tagFolderSetting = writable<TagFolderSettings>(DEFAULT_SETTINGS);
diff --git a/types.ts b/types.ts
index 84360aa..b689d0e 100644
--- a/types.ts
+++ b/types.ts
@@ -65,6 +65,7 @@ export interface TagFolderSettings {
 	tagInfo: string;
 	mergeRedundantCombination: boolean;
 	useVirtualTag: boolean;
+	doNotSimplifyTags: boolean;
 }
 
 export const DEFAULT_SETTINGS: TagFolderSettings = {
@@ -88,6 +89,7 @@ export const DEFAULT_SETTINGS: TagFolderSettings = {
 	tagInfo: "pininfo.md",
 	mergeRedundantCombination: false,
 	useVirtualTag: false,
+	doNotSimplifyTags: false,
 };
 
 export const VIEW_TYPE_SCROLL = "tagfolder-view-scroll";
diff --git a/util.ts b/util.ts
index c0af2e3..ee3b758 100644
--- a/util.ts
+++ b/util.ts
@@ -1,4 +1,4 @@
-import { SUBTREE_MARK, TreeItem, ViewItem, TagFolderItem, EPOCH_DAY, EPOCH_HOUR, FRESHNESS_1, FRESHNESS_2, FRESHNESS_3, FRESHNESS_4, FRESHNESS_5, tagDispDict } from "types";
+import { SUBTREE_MARK, TreeItem, ViewItem, TagFolderItem, EPOCH_DAY, EPOCH_HOUR, FRESHNESS_1, FRESHNESS_2, FRESHNESS_3, FRESHNESS_4, FRESHNESS_5, tagDispDict, TagFolderSettings } from "types";
 
 export function unique<T>(items: T[]) {
 	return [...new Set<T>([...items])];
@@ -8,7 +8,8 @@ export function allTags(entry: TagFolderItem): string[] {
 	return unique([...(entry?.descendants ?? []).flatMap(e => e.tags), ...entry.children.flatMap(e => "tag" in e ? allTags(e) : e.tags).filter(e => e)]);
 }
 
-export function isAutoExpandTree(entry: TreeItem) {
+export function isAutoExpandTree(entry: TreeItem, setting: TagFolderSettings) {
+	if (setting.doNotSimplifyTags) return false;
 	if ("tag" in entry) {
 
 		const childrenTags = entry.children.filter(
@@ -39,7 +40,8 @@ export function isAutoExpandTree(entry: TreeItem) {
 	return false;
 }
 
-export function omittedTags(entry: TreeItem): false | string[] {
+export function omittedTags(entry: TreeItem, setting: TagFolderSettings): false | string[] {
+	if (setting.doNotSimplifyTags) return false;
 	const childrenTags = entry.children.filter(
 		(e) => "tag" in e
 	) as TreeItem[];
@@ -94,7 +96,7 @@ export function renderSpecialTag(tagSrc: string) {
 	const tag = tagSrc.startsWith(SUBTREE_MARK)
 		? tagSrc.substring(SUBTREE_MARK.length)
 		: tagSrc;
-	return tag in tagDispDict ? tagDispDict[tag] : tag;
+	return tag in tagDispDict ? tagDispDict[tag] : tagSrc;
 
 }