obsidian-plugin/wenlzhang_obsidian-folder-navigator
1
0
Fork 0
mirror of https://github.com/wenlzhang/obsidian-folder-navigator.git synced 2026-07-22 05:41:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve code format

Browse source
This commit is contained in:
wz 2025-04-30 19:21:30 +02:00
parent 72506484ee
commit 5929cd9cf2
3 changed files with 132 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

126
src/folderSuggestModal.ts
View file

@ -1,4 +1,11 @@
import { App, FuzzySuggestModal, TFolder, WorkspaceLeaf, View, FuzzyMatch } from "obsidian";
import {
App,
FuzzySuggestModal,
TFolder,
WorkspaceLeaf,
View,
FuzzyMatch,
} from "obsidian";
import type FolderNavigatorPlugin from "./main";
import { FolderSortMode } from "./settings";
@ -66,23 +73,25 @@ export class FolderSuggestModal extends FuzzySuggestModal<TFolder> {
private getSortedFolders(): TFolder[] {
const allFolders = this.getAllFolders();
const sortMode = this.plugin.settings.folderSortMode;
log(`Sorting folders using mode: ${sortMode}`, this.plugin);
// Default sorting (alphabetical by path)
if (sortMode === FolderSortMode.DEFAULT) {
return allFolders;
}
// Get folder history from settings
const folderHistory = this.plugin.settings.folderHistory;
if (sortMode === FolderSortMode.RECENCY) {
// Create a copy of all folders to sort
const recentLimit = this.plugin.settings.recentFoldersToShow;
// Find folders with history and sort by last accessed timestamp (descending)
const foldersWithHistory = allFolders.filter(f => folderHistory[f.path]);
const foldersWithHistory = allFolders.filter(
(f) => folderHistory[f.path],
);
const recentFolders = foldersWithHistory
.sort((a, b) => {
const timeA = folderHistory[a.path]?.lastAccessed || 0;
@ -90,39 +99,52 @@ export class FolderSuggestModal extends FuzzySuggestModal<TFolder> {
return timeB - timeA; // Descending order (newest first)
})
.slice(0, recentLimit);
// Get the remaining folders (those without history or beyond the limit)
const recentFolderPaths = new Set(recentFolders.map(f => f.path));
const remainingFolders = allFolders.filter(f => !recentFolderPaths.has(f.path));
log(`Found ${recentFolders.length} recent folders to display`, this.plugin);
const recentFolderPaths = new Set(recentFolders.map((f) => f.path));
const remainingFolders = allFolders.filter(
(f) => !recentFolderPaths.has(f.path),
);
log(
`Found ${recentFolders.length} recent folders to display`,
this.plugin,
);
// Only add separator if we have recent folders to show
if (recentFolders.length > 0) {
// Create a separator "folder" (not a real folder)
const separator = {} as TFolder;
(separator as any)._isSeparator = true;
(separator as any)._separatorText = "— Recently visited folders —";
(separator as any)._separatorText =
"— Recently visited folders —";
// Create another separator for the remaining folders
const remainingSeparator = {} as TFolder;
(remainingSeparator as any)._isSeparator = true;
(remainingSeparator as any)._separatorText = "— All folders —";
// Combine recent folders with remaining folders with separators
return [separator, ...recentFolders, remainingSeparator, ...remainingFolders];
return [
separator,
...recentFolders,
remainingSeparator,
...remainingFolders,
];
}
// If no recent folders, just return all folders
return allFolders;
}
if (sortMode === FolderSortMode.FREQUENCY) {
// Create a copy of all folders to sort
const frequentLimit = this.plugin.settings.frequentFoldersToShow;
// Find folders with history and sort by access count (descending)
const foldersWithHistory = allFolders.filter(f => folderHistory[f.path]);
const foldersWithHistory = allFolders.filter(
(f) => folderHistory[f.path],
);
const frequentFolders = foldersWithHistory
.sort((a, b) => {
const countA = folderHistory[a.path]?.accessCount || 0;
@ -130,33 +152,46 @@ export class FolderSuggestModal extends FuzzySuggestModal<TFolder> {
return countB - countA; // Descending order (most frequent first)
})
.slice(0, frequentLimit);
// Get the remaining folders (those without history or beyond the limit)
const frequentFolderPaths = new Set(frequentFolders.map(f => f.path));
const remainingFolders = allFolders.filter(f => !frequentFolderPaths.has(f.path));
log(`Found ${frequentFolders.length} frequent folders to display`, this.plugin);
const frequentFolderPaths = new Set(
frequentFolders.map((f) => f.path),
);
const remainingFolders = allFolders.filter(
(f) => !frequentFolderPaths.has(f.path),
);
log(
`Found ${frequentFolders.length} frequent folders to display`,
this.plugin,
);
// Only add separator if we have frequent folders to show
if (frequentFolders.length > 0) {
// Create a separator "folder" (not a real folder)
const separator = {} as TFolder;
(separator as any)._isSeparator = true;
(separator as any)._separatorText = "— Frequently visited folders —";
(separator as any)._separatorText =
"— Frequently visited folders —";
// Create another separator for the remaining folders
const remainingSeparator = {} as TFolder;
(remainingSeparator as any)._isSeparator = true;
(remainingSeparator as any)._separatorText = "— All folders —";
// Combine frequent folders with remaining folders with separators
return [separator, ...frequentFolders, remainingSeparator, ...remainingFolders];
return [
separator,
...frequentFolders,
remainingSeparator,
...remainingFolders,
];
}
// If no frequent folders, just return all folders
return allFolders;
}
// Fallback to default sorting
return allFolders;
}
@ -167,22 +202,25 @@ export class FolderSuggestModal extends FuzzySuggestModal<TFolder> {
private updateFolderHistory(folder: TFolder): void {
// Get current history or create new entry
const folderPath = folder.path;
const history = this.plugin.settings.folderHistory[folderPath] || {
const history = this.plugin.settings.folderHistory[folderPath] || {
lastAccessed: 0,
accessCount: 0
accessCount: 0,
};
// Update history data
history.lastAccessed = Date.now();
history.accessCount += 1;
// Save back to settings
this.plugin.settings.folderHistory[folderPath] = history;
// Save settings
this.plugin.saveSettings();
log(`Updated folder history for "${folderPath}": ${JSON.stringify(history)}`, this.plugin);
log(
`Updated folder history for "${folderPath}": ${JSON.stringify(history)}`,
this.plugin,
);
}
getItems(): TFolder[] {
@ -266,7 +304,7 @@ export class FolderSuggestModal extends FuzzySuggestModal<TFolder> {
if ((folder as any)._isSeparator) {
return;
}
log(
`Folder selected: "${folder.path}" (name: "${folder.name}")`,
this.plugin,
@ -275,7 +313,7 @@ export class FolderSuggestModal extends FuzzySuggestModal<TFolder> {
try {
// Update folder history
this.updateFolderHistory(folder);
// Close the modal first
this.close();
@ -484,12 +522,12 @@ export class FolderSuggestModal extends FuzzySuggestModal<TFolder> {
if ((item.item as any)._isSeparator) {
el.empty();
const separatorEl = el.createDiv({
cls: "folder-separator"
cls: "folder-separator",
});
separatorEl.setText((item.item as any)._separatorText);
return;
}
// Regular folder rendering - use the default rendering
super.renderSuggestion(item, el);
}

13
src/settings.ts
View file

@ -3,7 +3,7 @@ import { App } from "obsidian";
export enum FolderSortMode {
DEFAULT = "default",
RECENCY = "recency",
FREQUENCY = "frequency"
FREQUENCY = "frequency",
}
export interface PluginSettings {
@ -13,10 +13,13 @@ export interface PluginSettings {
folderSortMode: FolderSortMode;
recentFoldersToShow: number;
frequentFoldersToShow: number;
folderHistory: Record<string, {
lastAccessed: number; // timestamp
accessCount: number; // visit count
}>;
folderHistory: Record<
string,
{
lastAccessed: number; // timestamp
accessCount: number; // visit count
}
>;
}
export const DEFAULT_SETTINGS: PluginSettings = {

64
src/settingsTab.ts
View file

@ -1,4 +1,11 @@
import { App, PluginSettingTab, Setting, DropdownComponent, Modal, Notice } from "obsidian";
import {
App,
PluginSettingTab,
Setting,
DropdownComponent,
Modal,
Notice,
} from "obsidian";
import FolderNavigatorPlugin from "./main";
import { FolderSortMode } from "./settings";
@ -56,7 +63,8 @@ export class SettingsTab extends PluginSettingTab {
.addOption(FolderSortMode.FREQUENCY, "Frequently visited")
.setValue(this.plugin.settings.folderSortMode)
.onChange(async (value: string) => {
this.plugin.settings.folderSortMode = value as FolderSortMode;
this.plugin.settings.folderSortMode =
value as FolderSortMode;
await this.plugin.saveSettings();
});
});
@ -65,7 +73,9 @@ export class SettingsTab extends PluginSettingTab {
if (this.plugin.settings.folderSortMode !== FolderSortMode.DEFAULT) {
new Setting(containerEl)
.setName("Recent folders to show")
.setDesc("Number of recently visited folders to display at the top when using the recency sort mode")
.setDesc(
"Number of recently visited folders to display at the top when using the recency sort mode",
)
.addSlider((slider) =>
slider
.setLimits(1, 20, 1)
@ -79,7 +89,9 @@ export class SettingsTab extends PluginSettingTab {
new Setting(containerEl)
.setName("Frequent folders to show")
.setDesc("Number of frequently visited folders to display at the top when using the frequency sort mode")
.setDesc(
"Number of frequently visited folders to display at the top when using the frequency sort mode",
)
.addSlider((slider) =>
slider
.setLimits(1, 20, 1)
@ -95,7 +107,9 @@ export class SettingsTab extends PluginSettingTab {
// Add reset history button
new Setting(containerEl)
.setName("Reset folder history")
.setDesc("Clear the tracked history of visited folders. Warning: This will remove all recency and frequency data.")
.setDesc(
"Clear the tracked history of visited folders. Warning: This will remove all recency and frequency data.",
)
.addButton((button) =>
button
.setButtonText("Reset")
@ -106,32 +120,38 @@ export class SettingsTab extends PluginSettingTab {
confirmModal.titleEl.setText("Reset folder history");
confirmModal.contentEl.createEl("p", {
text: "Are you sure? This will permanently delete all folder navigation history including recently visited and frequently used folder data.",
cls: "mod-warning"
cls: "mod-warning",
});
const buttonContainer = confirmModal.contentEl.createDiv({
cls: "modal-button-container"
});
const buttonContainer =
confirmModal.contentEl.createDiv({
cls: "modal-button-container",
});
// Cancel button
buttonContainer.createEl("button", {
text: "Cancel"
}).addEventListener("click", () => {
confirmModal.close();
});
buttonContainer
.createEl("button", {
text: "Cancel",
})
.addEventListener("click", () => {
confirmModal.close();
});
// Confirm button
const confirmButton = buttonContainer.createEl("button", {
text: "Reset folder history",
cls: "mod-warning"
});
const confirmButton = buttonContainer.createEl(
"button",
{
text: "Reset folder history",
cls: "mod-warning",
},
);
confirmButton.addEventListener("click", async () => {
this.plugin.settings.folderHistory = {};
await this.plugin.saveSettings();
confirmModal.close();
new Notice("Folder history has been reset");
});
confirmModal.open();
}),
);