tpl
/
obsidian-sample-plugin
Template
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#145 - polished code w/o duplication in main.js

This commit is contained in:
SebastianMC 2024-05-14 08:47:38 +02:00
parent 4ab21d6ff5
commit 3c257bc5d2
1 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
src/main.ts
View File

@ -587,6 +587,32 @@ export default class CustomSortPlugin extends Plugin {
return ctx return ctx
} }
resetIconInaccurateStateToEnabled() {
if (this.ribbonIconStateInaccurate && this.ribbonIconEl) {
this.ribbonIconStateInaccurate = false
setIcon(this.ribbonIconEl, ICON_SORT_ENABLED_ACTIVE)
}
}
determineAndPrepareSortingDataForFolder(folder: TFolder) {
let sortSpec: CustomSortSpec | null | undefined = this.determineSortSpecForFolder(folder.path, folder.name)
// Performance optimization
// Primary intention: when the implicit bookmarks integration is enabled, remain on std Obsidian, if no need to involve bookmarks
let sortingAndGroupingStats: HasSortingOrGrouping = collectSortingAndGroupingTypes(sortSpec)
if (hasOnlyByBookmarkOrStandardObsidian(sortingAndGroupingStats)) {
const bookmarksPlugin: BookmarksPluginInterface | undefined = getBookmarksPlugin(this.app, this.settings.bookmarksGroupToConsumeAsOrderingReference, false, true)
if (!bookmarksPlugin?.bookmarksIncludeItemsInFolder(folder.path)) {
sortSpec = null
}
}
return {
sortSpec: sortSpec,
sortingAndGroupingStats: sortingAndGroupingStats
}
}
// For the idea of monkey-patching credits go to https://github.com/nothingislost/obsidian-bartender // For the idea of monkey-patching credits go to https://github.com/nothingislost/obsidian-bartender
patchFileExplorerFolder(patchableFileExplorer?: FileExplorerView): boolean { patchFileExplorerFolder(patchableFileExplorer?: FileExplorerView): boolean {
let plugin = this; let plugin = this;
@ -604,26 +630,13 @@ export default class CustomSortPlugin extends Plugin {
return old.call(this, ...args); return old.call(this, ...args);
} }
if (plugin.ribbonIconStateInaccurate && plugin.ribbonIconEl) { plugin.resetIconInaccurateStateToEnabled()
plugin.ribbonIconStateInaccurate = false
setIcon(plugin.ribbonIconEl, ICON_SORT_ENABLED_ACTIVE)
}
const folder = args[0] const folder = args[0]
let sortSpec: CustomSortSpec | null | undefined = plugin.determineSortSpecForFolder(folder.path, folder.name) const sortingData = plugin.determineAndPrepareSortingDataForFolder(folder)
// Performance optimization if (sortingData.sortSpec) {
// Primary intention: when the implicit bookmarks integration is enabled, remain on std Obsidian, if no need to involve bookmarks return getSortedFolderItems_vFrom_1_6_0.call(this, folder, sortingData.sortSpec, plugin.createProcessingContextForSorting(sortingData.sortingAndGroupingStats))
let has: HasSortingOrGrouping = collectSortingAndGroupingTypes(sortSpec)
if (hasOnlyByBookmarkOrStandardObsidian(has)) {
const bookmarksPlugin: BookmarksPluginInterface|undefined = getBookmarksPlugin(plugin.app, plugin.settings.bookmarksGroupToConsumeAsOrderingReference, false, true)
if ( !bookmarksPlugin?.bookmarksIncludeItemsInFolder(folder.path)) {
sortSpec = null
}
}
if (sortSpec) {
return getSortedFolderItems_vFrom_1_6_0.call(this, folder, sortSpec, plugin.createProcessingContextForSorting(has))
} else { } else {
return old.call(this, ...args); return old.call(this, ...args);
} }
@ -645,26 +658,13 @@ export default class CustomSortPlugin extends Plugin {
return old.call(this, ...args); return old.call(this, ...args);
} }
if (plugin.ribbonIconStateInaccurate && plugin.ribbonIconEl) { plugin.resetIconInaccurateStateToEnabled()
plugin.ribbonIconStateInaccurate = false
setIcon(plugin.ribbonIconEl, ICON_SORT_ENABLED_ACTIVE)
}
const folder: TFolder = this.file const folder: TFolder = this.file
let sortSpec: CustomSortSpec | null | undefined = plugin.determineSortSpecForFolder(folder.path, folder.name) const sortingData = plugin.determineAndPrepareSortingDataForFolder(folder)
// Performance optimization if (sortingData.sortSpec) {
// Primary intention: when the implicit bookmarks integration is enabled, remain on std Obsidian, if no need to involve bookmarks return folderSort_vUpTo_1_6_0.call(this, sortingData.sortSpec, plugin.createProcessingContextForSorting(sortingData.sortingAndGroupingStats));
let has: HasSortingOrGrouping = collectSortingAndGroupingTypes(sortSpec)
if (hasOnlyByBookmarkOrStandardObsidian(has)) {
const bookmarksPlugin: BookmarksPluginInterface | undefined = getBookmarksPlugin(plugin.app, plugin.settings.bookmarksGroupToConsumeAsOrderingReference, false, true)
if (!bookmarksPlugin?.bookmarksIncludeItemsInFolder(folder.path)) {
sortSpec = null
}
}
if (sortSpec) {
return folderSort_vUpTo_1_6_0.call(this, sortSpec, plugin.createProcessingContextForSorting(has));
} else { } else {
return old.call(this, ...args); return old.call(this, ...args);
} }