await each renameFunc so that the deduplication mechanism could work

reorx · May 8, 2022 · 9d3b311 · 9d3b311
1 parent 4886fce
commit 9d3b311
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/batch.ts b/src/batch.ts
@@ -16,13 +16,15 @@ interface RenameTask {
 	name: string
 }
 
+type renameFuncType = (file: TFile, name: string) => Promise<void>
+
 export class ImageBatchRenameModal extends Modal {
 	activeFile: TFile
-	renameFunc: (file: TFile, name: string) => void
+	renameFunc: renameFuncType
 	onCloseExtra: () => void
 	state: State
 
-	constructor(app: App, activeFile: TFile, renameFunc: (file: TFile, name: string) => void, onClose: () => void) {
+	constructor(app: App, activeFile: TFile, renameFunc: renameFuncType, onClose: () => void) {
 		super(app);
 		this.activeFile = activeFile
 		this.renameFunc = renameFunc
@@ -170,10 +172,10 @@ export class ImageBatchRenameModal extends Modal {
 		this.onCloseExtra()
 	}
 
-	renameAll() {
+	async renameAll() {
 		debugLog('renameAll', this.state)
 		for (const task of this.state.renameTasks) {
-			this.renameFunc(task.file, task.name)
+			await this.renameFunc(task.file, task.name)
 		}
 	}
 

diff --git a/src/main.ts b/src/main.ts
@@ -191,8 +191,8 @@ export default class PasteImageRenamePlugin extends Plugin {
 		const modal = new ImageBatchRenameModal(
 			this.app,
 			activeFile,
-			(file: TFile, name: string) => {
-				this.renameFile(file, name, activeFile.path)
+			async (file: TFile, name: string) => {
+				await this.renameFile(file, name, activeFile.path)
 			},
 			() => {
 				this.modals.splice(this.modals.indexOf(modal), 1)