Skip to content

TagSpaces is an offline, open source, document manager with tagging support

fix moveFiles

sytolk1bacc438d0a1
diff --git a/src/main/mainEvents.ts b/src/main/mainEvents.ts
index a101c2573..ee08e15ba 100644
--- a/src/main/mainEvents.ts
+++ b/src/main/mainEvents.ts
@@ -162,8 +162,18 @@ export default function loadMainEvents() {
);
ipcMain.handle(
'renameFilePromise',
- async (event, filePath, newFilePath, onProgress) => {
- const result = await renameFilePromise(filePath, newFilePath, onProgress);
+ async (event, filePath, newFilePath, withProgress) => {
+ let result;
+ if (withProgress) {
+ progress['renameFilePromise'] = newProgress('renameFilePromise', 1);
+ result = await renameFilePromise(
+ filePath,
+ newFilePath,
+ getOnProgress('renameFilePromise', progress),
+ );
+ } else {
+ result = await renameFilePromise(filePath, newFilePath, undefined);
+ }
return result;
},
);
diff --git a/src/renderer/hooks/PlatformFacadeContextProvider.tsx b/src/renderer/hooks/PlatformFacadeContextProvider.tsx
index e8bd4d4fe..db920ac0c 100644
--- a/src/renderer/hooks/PlatformFacadeContextProvider.tsx
+++ b/src/renderer/hooks/PlatformFacadeContextProvider.tsx
@@ -441,9 +441,8 @@ export const PlatformFacadeContextProvider = ({
const r = ret.filter((r) => r !== undefined);
if (reflect && r.length > 0) {
reflectMoveFiles(renameJobs);
- return r;
}
- return undefined;
+ return r;
});
}
diff --git a/src/renderer/services/platform-facade.ts b/src/renderer/services/platform-facade.ts
index 02c8d8c69..4b7f7afcd 100644
--- a/src/renderer/services/platform-facade.ts
+++ b/src/renderer/services/platform-facade.ts
@@ -462,7 +462,7 @@ export default class PlatformFacade {
'renameFilePromise',
filePath,
newFilePath,
- onProgress,
+ onProgress !== undefined,
);
} else if (AppConfig.isCordova) {
return cordovaIO.renameFilePromise(filePath, newFilePath, onProgress);