Skip to content

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

fix thumbgen for files with tags

sytolkc9533b21d19d
diff --git a/release/app/package-lock.json b/release/app/package-lock.json
index 16b9ea31f..ba966bed7 100644
--- a/release/app/package-lock.json
+++ b/release/app/package-lock.json
@@ -1,17 +1,17 @@
{
"name": "tagspaces",
- "version": "5.7.12",
+ "version": "5.7.13",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "tagspaces",
- "version": "5.7.12",
+ "version": "5.7.13",
"hasInstallScript": true,
"license": "AGPL-3.0",
"dependencies": {
"@elife/pm2": "3.6.1",
- "@tagspaces/extensions": "1.0.100",
+ "@tagspaces/extensions": "1.0.102",
"@tagspaces/tagspaces-common-node": "4.1.18",
"@tagspaces/tagspaces-ws": "4.1.18",
"sharp": "0.32.6",
@@ -30,9 +30,9 @@
}
},
"node_modules/@tagspaces/extensions": {
- "version": "1.0.100",
- "resolved": "https://registry.npmjs.org/@tagspaces/extensions/-/extensions-1.0.100.tgz",
- "integrity": "sha512-YNRYTMBcD5DQDuKUlrw21RO5gPeE2iAlBOQdC5xnYsYrbTt2y3mRzOyw+/DcRuNQ3hP4u5CsxVzK7VUFePiFfg==",
+ "version": "1.0.102",
+ "resolved": "https://registry.npmjs.org/@tagspaces/extensions/-/extensions-1.0.102.tgz",
+ "integrity": "sha512-CF1fKZNOLw5Fccgx1W7ZXMygQfNRG/VXQRDbKdk/PzPbgZfJKhPEUm+eGhc5yz4GIcDG2RDr3otJF5jfgkFYqw==",
"dependencies": {
"shelljs": "^0.8.5",
"shx": "^0.3.4"
@@ -1093,9 +1093,9 @@
}
},
"@tagspaces/extensions": {
- "version": "1.0.100",
- "resolved": "https://registry.npmjs.org/@tagspaces/extensions/-/extensions-1.0.100.tgz",
- "integrity": "sha512-YNRYTMBcD5DQDuKUlrw21RO5gPeE2iAlBOQdC5xnYsYrbTt2y3mRzOyw+/DcRuNQ3hP4u5CsxVzK7VUFePiFfg==",
+ "version": "1.0.102",
+ "resolved": "https://registry.npmjs.org/@tagspaces/extensions/-/extensions-1.0.102.tgz",
+ "integrity": "sha512-CF1fKZNOLw5Fccgx1W7ZXMygQfNRG/VXQRDbKdk/PzPbgZfJKhPEUm+eGhc5yz4GIcDG2RDr3otJF5jfgkFYqw==",
"requires": {
"shelljs": "^0.8.5",
"shx": "^0.3.4"
diff --git a/src/renderer/components/menus/DirectoryMenu.tsx b/src/renderer/components/menus/DirectoryMenu.tsx
index aaad8c506..dddaa1158 100644
--- a/src/renderer/components/menus/DirectoryMenu.tsx
+++ b/src/renderer/components/menus/DirectoryMenu.tsx
@@ -50,6 +50,7 @@ import { useSelectedEntriesContext } from '-/hooks/useSelectedEntriesContext';
import { usePlatformFacadeContext } from '-/hooks/usePlatformFacadeContext';
import { useThumbGenerationContext } from '-/hooks/useThumbGenerationContext';
import { generateClipboardLink } from '-/utils/dom';
+import { useEditedEntryContext } from '-/hooks/useEditedEntryContext';
interface Props {
open: boolean;
@@ -83,6 +84,7 @@ function DirectoryMenu(props: Props) {
} = useDirectoryContentContext();
const { generateThumbnails } = useThumbGenerationContext();
const { copyFilePromise, renameFilePromise } = usePlatformFacadeContext();
+ const { setReflectActions } = useEditedEntryContext();
const fileUploadContainerRef = useRef<FileUploadContainerRef>(null);
const {
open,
@@ -303,8 +305,12 @@ Do you want to continue?`)
const newFilePath =
normalizePath(directoryPath) + PlatformIO.getDirSeparator() + fileName;
- renameFilePromise(filePath, newFilePath)
- .then(() => {
+ renameFilePromise(filePath, newFilePath, undefined, false)
+ .then((newEntry) => {
+ setReflectActions({
+ action: 'add',
+ entry: newEntry,
+ });
showNotification(
'File ' + newFilePath + ' successfully imported.',
'default',
diff --git a/src/renderer/hooks/IOActionsContextProvider.tsx b/src/renderer/hooks/IOActionsContextProvider.tsx
index 77832ba72..4b38dd54a 100644
--- a/src/renderer/hooks/IOActionsContextProvider.tsx
+++ b/src/renderer/hooks/IOActionsContextProvider.tsx
@@ -1049,7 +1049,7 @@ export const IOActionsContextProvider = ({
reflect = true,
): Promise<boolean> {
return renameFilePromise(filePath, newFilePath, undefined, reflect)
- .then((result) => {
+ .then(() => {
// const newFilePathFromPromise = result[1];
console.info('File renamed ' + filePath + ' to ' + newFilePath);
showNotification(t('core:renamingSuccessfully'), 'default', true);
diff --git a/src/renderer/hooks/PlatformFacadeContextProvider.tsx b/src/renderer/hooks/PlatformFacadeContextProvider.tsx
index 2e84e96ff..72c0713d9 100644
--- a/src/renderer/hooks/PlatformFacadeContextProvider.tsx
+++ b/src/renderer/hooks/PlatformFacadeContextProvider.tsx
@@ -334,19 +334,27 @@ export const PlatformFacadeContextProvider = ({
});
}
+ /**
+ * @param filePath
+ * @param newFilePath
+ * @param onProgress
+ * @param reflect
+ * return Promise<TS.FileSystemEntry> new file entry renamed
+ */
function renameFilePromise(
filePath: string,
newFilePath: string,
onProgress = undefined,
reflect = true,
- ): Promise<any> {
+ ): Promise<TS.FileSystemEntry> {
ignoreByWatcher(filePath, newFilePath);
return PlatformFacade.renameFilePromise(
filePath,
newFilePath,
onProgress,
).then((result) => {
- getAllPropertiesPromise(newFilePath).then(
+ deignoreByWatcher(filePath, newFilePath);
+ return getAllPropertiesPromise(newFilePath).then(
(fsEntry: TS.FileSystemEntry) => {
if (reflect) {
setReflectActions({
@@ -355,10 +363,9 @@ export const PlatformFacadeContextProvider = ({
oldEntryPath: filePath,
});
}
+ return fsEntry;
},
);
- deignoreByWatcher(filePath, newFilePath);
- return result;
});
}
diff --git a/src/renderer/services/thumbsgenerator.ts b/src/renderer/services/thumbsgenerator.ts
index af82e9cf2..c85896c4a 100644
--- a/src/renderer/services/thumbsgenerator.ts
+++ b/src/renderer/services/thumbsgenerator.ts
@@ -302,7 +302,7 @@ export function generateThumbnailPromise(fileURL: string, fileSize: number) {
} else if (Pro && ext === 'psd') {
return Pro.ThumbsGenerator.generatePSDThumbnail(fileURLEscaped, maxSize);
} else if (fileSize && fileSize < maxFileSize) {
- return generateImageThumbnail(fileURLEscaped);
+ return generateImageThumbnail(fileURL); //fileURLEscaped);
}
} else if (Pro && ext === 'pdf') {
return Pro.ThumbsGenerator.generatePDFThumbnail(fileURLEscaped, maxSize);