TagSpaces is an offline, open source, document manager with tagging support
Thumbnail not updated on renamed file (#2039)
Stanimirba6eefb8858d
diff --git a/release/app/package-lock.json b/release/app/package-lock.jsonindex 4d564fa38..d114313d3 100644--- a/release/app/package-lock.json+++ b/release/app/package-lock.json@@ -11,7 +11,7 @@"license": "AGPL-3.0","dependencies": {"@elife/pm2": "3.6.1",- "@tagspaces/extensions": "1.0.93",+ "@tagspaces/extensions": "1.0.95","@tagspaces/tagspaces-common-node": "4.1.3","@tagspaces/tagspaces-ws": "4.1.3","sharp": "0.32.6",@@ -30,9 +30,9 @@}},"node_modules/@tagspaces/extensions": {- "version": "1.0.93",- "resolved": "https://registry.npmjs.org/@tagspaces/extensions/-/extensions-1.0.93.tgz",- "integrity": "sha512-zq7JvlO8GdESkSqF3mnvFffsX3+iQ3tUNSyNi4sR1jDcCGmctSUSe/p+5oUE4J+dNgZBDMlc/v7gUt+vIIzXtQ==",+ "version": "1.0.95",+ "resolved": "https://registry.npmjs.org/@tagspaces/extensions/-/extensions-1.0.95.tgz",+ "integrity": "sha512-Db8QuXN4WO+SVZyahhts6nxhZB/DqxmZ7ym776hmpKBRcbjXi+zwexG1I32d+BYKnFWisaYMdXSO7xXLpwAyNQ==","dependencies": {"shelljs": "^0.8.5","shx": "^0.3.4"@@ -1093,9 +1093,9 @@}},"@tagspaces/extensions": {- "version": "1.0.93",- "resolved": "https://registry.npmjs.org/@tagspaces/extensions/-/extensions-1.0.93.tgz",- "integrity": "sha512-zq7JvlO8GdESkSqF3mnvFffsX3+iQ3tUNSyNi4sR1jDcCGmctSUSe/p+5oUE4J+dNgZBDMlc/v7gUt+vIIzXtQ==",+ "version": "1.0.95",+ "resolved": "https://registry.npmjs.org/@tagspaces/extensions/-/extensions-1.0.95.tgz",+ "integrity": "sha512-Db8QuXN4WO+SVZyahhts6nxhZB/DqxmZ7ym776hmpKBRcbjXi+zwexG1I32d+BYKnFWisaYMdXSO7xXLpwAyNQ==","requires": {"shelljs": "^0.8.5","shx": "^0.3.4"diff --git a/release/app/package.json b/release/app/package.jsonindex f12d96e7c..c36e0626f 100644--- a/release/app/package.json+++ b/release/app/package.json@@ -18,7 +18,7 @@},"dependencies": {"@elife/pm2": "3.6.1",- "@tagspaces/extensions": "1.0.93",+ "@tagspaces/extensions": "1.0.95","@tagspaces/tagspaces-common-node": "4.1.3","@tagspaces/tagspaces-ws": "4.1.3","sharp": "0.32.6",diff --git a/src/renderer/hooks/IOActionsContextProvider.tsx b/src/renderer/hooks/IOActionsContextProvider.tsxindex 0b035facb..6d3d4f8ac 100644--- a/src/renderer/hooks/IOActionsContextProvider.tsx+++ b/src/renderer/hooks/IOActionsContextProvider.tsx@@ -146,6 +146,7 @@ export const IOActionsContextProvider = ({renameFilePromise,renameFilesPromise,moveFilesPromise,+ reflectMoveFiles,renameDirectoryPromise,copyFilePromise,copyFilesWithProgress,@@ -353,7 +354,7 @@ export const IOActionsContextProvider = ({PlatformIO.getDirSeparator() +extractFileName(path, PlatformIO.getDirSeparator()),]);- return moveFilesPromise(moveJobs, onProgress)+ return moveFilesPromise(moveJobs, onProgress, false).then(() => {showNotification(t('core:filesMovedSuccessful'));const moveMetaJobs = [];@@ -413,15 +414,15 @@ export const IOActionsContextProvider = ({]);return true;});- moveFilesPromise(moveMetaJobs, undefined, false)+ return moveFilesPromise(moveMetaJobs, undefined, false).then(() => {console.log('Moving meta and thumbs successful');- return true;+ return reflectMoveFiles(moveJobs);}).catch((err) => {console.warn('At least one meta or thumb was not moved ' + err);+ return reflectMoveFiles(moveJobs);});- return true;}).catch((err) => {console.warn('Moving files failed with ' + err);diff --git a/src/renderer/hooks/PlatformFacadeContextProvider.tsx b/src/renderer/hooks/PlatformFacadeContextProvider.tsxindex ad9fae68d..ee0f57d62 100644--- a/src/renderer/hooks/PlatformFacadeContextProvider.tsx+++ b/src/renderer/hooks/PlatformFacadeContextProvider.tsx@@ -73,6 +73,7 @@ type PlatformFacadeContextData = {onProgress?,reflect?,) => Promise<any>;+ reflectMoveFiles: (moveJobs: Array<Array<string>>) => Promise<boolean>;renameDirectoryPromise: (dirPath: string, newDirName: string) => Promise<any>;copyDirectoryPromise: (param: any,@@ -116,6 +117,7 @@ export const PlatformFacadeContext = createContext<PlatformFacadeContextData>({renameFilesPromise: undefined,moveFilePromise: undefined,moveFilesPromise: undefined,+ reflectMoveFiles: undefined,renameDirectoryPromise: undefined,copyDirectoryPromise: undefined,moveDirectoryPromise: undefined,@@ -375,7 +377,10 @@ export const PlatformFacadeContextProvider = ({newFilePath,onProgress,).then((result) => {- getAllPropertiesPromise(newFilePath).then(+ if (reflect) {+ reflectMoveFiles([[filePath, newFilePath]]);+ }+ /*getAllPropertiesPromise(newFilePath).then((fsEntry: TS.FileSystemEntry) => {if (reflect) {setReflectActions(@@ -390,7 +395,7 @@ export const PlatformFacadeContextProvider = ({);}},- );+ );*/deignoreByWatcher(filePath, newFilePath);return result;});@@ -418,24 +423,37 @@ export const PlatformFacadeContextProvider = ({}),).then((ret) => {if (reflect) {- const actions: TS.EditAction[] = [];- renameJobs.map((job) => {- actions.push({- action: 'delete',- entry: toFsEntry(job[0], true),- });- actions.push({- action: 'add',- entry: toFsEntry(job[1], true),- });- });- setReflectActions(...actions);+ reflectMoveFiles(renameJobs);}deignoreByWatcher(...flatArray);return ret;});}+ function reflectMoveFiles(moveJobs: Array<Array<string>>): Promise<boolean> {+ const promises = moveJobs.map((job) => {+ return getAllPropertiesPromise(job[1]).then(+ (newFsEntry: TS.FileSystemEntry) => {+ const actions: TS.EditAction[] = [+ {+ action: 'delete',+ entry: toFsEntry(job[0], true),+ },+ {+ action: 'add',+ entry: newFsEntry,+ },+ ];+ return actions;+ },+ );+ });+ return Promise.all(promises).then((actionsArray) => {+ setReflectActions(...actionsArray.flat());+ return true;+ });+ }+function renameDirectoryPromise(dirPath: string,newDirName: string,@@ -582,6 +600,7 @@ export const PlatformFacadeContextProvider = ({renameFilesPromise,moveFilePromise,moveFilesPromise,+ reflectMoveFiles,renameDirectoryPromise,copyDirectoryPromise,moveDirectoryPromise,