Merge remote-tracking branch 'origin/master' into 195-mdata-matchers

Author: SebastianMC

manifest.json

@@ -1,7 +1,7 @@
 {
 	"id": "custom-sort",
 	"name": "Custom File Explorer sorting",
-	"version": "3.1.3",
+	"version": "3.1.4",
 	"minAppVersion": "1.7.2",
 	"description": "Allows for manual and automatic, config-driven reordering and sorting of files and folders in File Explorer",
 	"author": "SebastianMC",

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "obsidian-custom-sort",
-	"version": "3.1.3",
+	"version": "3.1.4",
 	"description": "Custom Sort plugin for Obsidian (https://obsidian.md)",
 	"main": "main.js",
 	"scripts": {

src/main.ts

@@ -101,6 +101,8 @@ export default class CustomSortPlugin
 	sortSpecCache?: SortSpecsCollection | null
 	customSortAppliedAtLeastOnce: boolean = false
 
+	uninstallerOfFileExplorerPatch: MonkeyAroundUninstaller|undefined = undefined
+
 	showNotice(message: string, timeout?: number) {
 		if (this.settings.notificationsEnabled || (Platform.isMobile && this.settings.mobileNotificationsEnabled)) {
 			new Notice(message, timeout)
@@ -231,21 +233,12 @@ export default class CustomSortPlugin
 	// For the idea of monkey-patching credits go to https://github.com/nothingislost/obsidian-bartender
 	patchFileExplorer(patchableFileExplorer: FileExplorerLeaf): FileExplorerLeaf|undefined {
 		let plugin = this;
-		const requestStandardObsidianSortAfter = (patchUninstaller: MonkeyAroundUninstaller|undefined) => {
-			return () => {
-				if (patchUninstaller) patchUninstaller()
-
-				const fileExplorerOrError= this.checkFileExplorerIsAvailableAndPatchable()
-				if (fileExplorerOrError.v && fileExplorerOrError.v.view) {
-					fileExplorerOrError.v.view.requestSort?.()
-				}
-			}
-		}
 
 		// patching file explorer might fail here because of various non-error reasons.
 		// That's why not showing and not logging error message here
 		if (patchableFileExplorer) {
-			const uninstallerOfFolderSortFunctionWrapper: MonkeyAroundUninstaller = around(patchableFileExplorer.view.constructor.prototype, {
+			this.uninstallFileExplorerPatchIfInstalled()
+			this.uninstallerOfFileExplorerPatch = around(patchableFileExplorer.view.constructor.prototype, {
 				getSortedFolderItems(old: any) {
 					return function (...args: any[]) {
 						// quick check for plugin status
@@ -272,7 +265,6 @@ export default class CustomSortPlugin
 					};
 				}
 			})
-			this.register(requestStandardObsidianSortAfter(uninstallerOfFolderSortFunctionWrapper))
 			return patchableFileExplorer
 		} else {
 			return undefined
@@ -379,6 +371,8 @@ export default class CustomSortPlugin
 
 		this.registerCommands()
 
+		this.registerPluginUnloadHandler()
+
 		this.initialize();
 	}
 
@@ -576,6 +570,31 @@ export default class CustomSortPlugin
 		})
 	}
 
+	uninstallFileExplorerPatchIfInstalled() {
+		if (this.uninstallerOfFileExplorerPatch) {
+			try {
+				this.uninstallerOfFileExplorerPatch()
+			} catch {
+
+			}
+			this.uninstallerOfFileExplorerPatch = undefined
+		}
+	}
+
+	registerPluginUnloadHandler() {
+		let plugin = this;
+
+		this.register(() => {
+			plugin.uninstallFileExplorerPatchIfInstalled()
+
+			// Request standard File Explorer sorting to remove any custom sorting cached by File Explorer
+			const fileExplorerOrError= plugin.checkFileExplorerIsAvailableAndPatchable()
+			if (fileExplorerOrError.v && fileExplorerOrError.v.view) {
+				fileExplorerOrError.v.view.requestSort?.()
+			}
+		})
+	}
+
 	registerCommands() {
 		const plugin: CustomSortPlugin = this
 		this.addCommand({

versions.json

@@ -54,5 +54,6 @@
 	"3.1.0": "1.7.2",
 	"3.1.1": "1.7.2",
 	"3.1.2": "1.7.2",
-	"3.1.3": "1.7.2"
+	"3.1.3": "1.7.2",
+	"3.1.4": "1.7.2"
 }