obsidian-plugin/lostpaul_obsidian-folder-notes
1
0
Fork 0
mirror of https://github.com/lostpaul/obsidian-folder-notes.git synced 2026-07-22 07:40:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix file depth for folder overview list type

Browse source
This commit is contained in:
Lost Paul 2024-12-29 16:25:46 +01:00
parent 7829afef3e
commit b3e0c0c1b3
2 changed files with 34 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
src/folderOverview/FolderOverview.ts
View file

@ -180,8 +180,11 @@ export class FolderOverview {
} else if (sourceFolder) {
files = sourceFolder.children;
}
console.log('sourceFolderPath', sourceFolderPath);
files = this.getAllFiles(files, sourceFolderPath, this.yaml.depth);
console.log('files', files);
files = this.filterFiles(files, plugin, sourceFolderPath, this.yaml.depth, this.pathBlacklist);
files = await this.filterFiles(files, plugin, sourceFolderPath, this.yaml.depth, this.pathBlacklist);
if (!this.yaml.includeTypes.includes('folder')) {
files = this.getAllFiles(files, sourceFolderPath, this.yaml.depth);
@ -261,19 +264,26 @@ export class FolderOverview {
}, { capture: true });
}
filterFiles(files: TAbstractFile[], plugin: FolderNotesPlugin, sourceFolderPath: string, depth: number, pathBlacklist: string[]) {
return files.filter(async (file) => {
if (pathBlacklist.includes(file.path) && !this.yaml.showFolderNotes) { return false; }
async filterFiles(files: TAbstractFile[], plugin: FolderNotesPlugin, sourceFolderPath: string, depth: number, pathBlacklist: string[]) {
const filteredFiles = await Promise.all(files.map(async (file) => {
const folderPath = getFolderPathFromString(file.path);
if (!folderPath.startsWith(sourceFolderPath) && sourceFolderPath !== '/') { return false; }
if (file.path === this.sourceFilePath) { return false; }
const excludedFolder = await getExcludedFolder(plugin, file.path, true);
if (excludedFolder?.excludeFromFolderOverview) { return false; }
if ((file.path.split('/').length - sourceFolderPath.split('/').length) - 1 < depth) {
return true;
if (
(pathBlacklist.includes(file.path) && !this.yaml.showFolderNotes) ||
!folderPath.startsWith(sourceFolderPath) && sourceFolderPath !== '/' ||
file.path === this.sourceFilePath ||
(await getExcludedFolder(plugin, file.path, true))?.excludeFromFolderOverview
) {
return null;
}
});
const fileDepth = file.path.split('/').length - sourceFolderPath.split('/').length;
return fileDepth <= depth ? file : null;
}));
return filteredFiles.filter(file => file !== null);
}
sortFiles(files: TAbstractFile[]): TAbstractFile[] {
const yaml = this.yaml;
@ -335,17 +345,27 @@ export class FolderOverview {
getAllFiles(files: TAbstractFile[], sourceFolderPath: string, depth: number) {
const allFiles: TAbstractFile[] = [];
const getDepth = (filePath: string) => {
return filePath.split('/').length - sourceFolderPath.split('/').length;
};
files.forEach((file) => {
const fileDepth = getDepth(file.path);
if (file instanceof TFolder) {
if ((file.path.split('/').length - sourceFolderPath.split('/').length) - 1 < depth - 1) {
if (fileDepth < depth) {
allFiles.push(...this.getAllFiles(file.children, sourceFolderPath, depth));
}
} else {
allFiles.push(file);
}
});
return allFiles;
}
fileMenu(file: TFile, e: MouseEvent) {
const plugin = this.plugin;

4
src/folderOverview/ListStyle.ts
View file

@ -59,14 +59,14 @@ export function addFolderList(plugin: FolderNotesPlugin, list: HTMLUListElement
return folderItem;
}
function goThroughFolders(plugin: FolderNotesPlugin, list: HTMLLIElement | HTMLUListElement, folder: TFolder,
async function goThroughFolders(plugin: FolderNotesPlugin, list: HTMLLIElement | HTMLUListElement, folder: TFolder,
depth: number, sourceFolderPath: string, ctx: MarkdownPostProcessorContext, yaml: yamlSettings,
pathBlacklist: string[], includeTypes: string[], disableFileTag: boolean, folderOverview: FolderOverview) {
if (sourceFolderPath === '') {
depth--;
}
let allFiles = folderOverview.filterFiles(folder.children, plugin, sourceFolderPath, depth, pathBlacklist);
let allFiles = await folderOverview.filterFiles(folder.children, plugin, sourceFolderPath, depth, pathBlacklist);
const files = folderOverview.sortFiles(allFiles.filter((file) => !(file instanceof TFolder)));
const folders = folderOverview.sortFiles(allFiles.filter((file) => file instanceof TFolder));