Skip to content

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

fix thumb

sytolke883b7c441ca
diff --git a/src/renderer/services/meta-loader.ts b/src/renderer/services/meta-loader.ts
index 87b6d6726..5394edd9e 100644
--- a/src/renderer/services/meta-loader.ts
+++ b/src/renderer/services/meta-loader.ts
@@ -3,6 +3,7 @@ import PlatformIO from '-/services/platform-facade';
import {
executePromisesInBatches,
getMetaForEntry,
+ loadJSONFile,
loadMetaForDir,
} from '-/services/utils-io';
import {
@@ -13,6 +14,7 @@ import {
} from '@tagspaces/tagspaces-common/paths';
import { getUuid } from '@tagspaces/tagspaces-common/utils-io';
import AppConfig from '-/AppConfig';
+import { enhanceEntry } from '@tagspaces/tagspaces-common/utils-io';
export function loadCurrentDirMeta(
directoryPath: string,
@@ -163,6 +165,57 @@ export function getEnhancedDir(
});*/
}
+export function getEnhancedFile(
+ entry: TS.FileSystemEntry,
+): Promise<TS.FileSystemEntry> {
+ if (!entry) {
+ return Promise.resolve(undefined);
+ }
+ if (!entry.isFile) {
+ return Promise.reject(
+ new Error('getEnhancedFile accept file only:' + entry.path),
+ );
+ }
+
+ const thumbFilePath = getThumbFileLocationForFile(
+ entry.path,
+ PlatformIO.getDirSeparator(),
+ false,
+ );
+
+ return PlatformIO.checkFileExist(thumbFilePath).then((exist) => {
+ const metaProps = exist ? { thumbPath: thumbFilePath } : {};
+
+ const metaFilePath = getMetaFileLocationForFile(
+ entry.path,
+ PlatformIO.getDirSeparator(),
+ );
+
+ try {
+ return loadJSONFile(metaFilePath).then((meta: TS.FileSystemEntryMeta) => {
+ if (meta) {
+ return enhanceEntry(
+ { ...entry, meta: { ...meta, ...metaProps } },
+ AppConfig.tagDelimiter,
+ PlatformIO.getDirSeparator(),
+ );
+ }
+ return enhanceEntry(
+ { ...entry, meta: { ...metaProps } },
+ AppConfig.tagDelimiter,
+ PlatformIO.getDirSeparator(),
+ );
+ });
+ } catch (e) {
+ return enhanceEntry(
+ { ...entry, meta: { ...metaProps } },
+ AppConfig.tagDelimiter,
+ PlatformIO.getDirSeparator(),
+ );
+ }
+ });
+}
+
export function getDirMeta(dirPath: string): Promise<TS.FileSystemEntryMeta> {
return PlatformIO.listMetaDirectoryPromise(dirPath).then((meta) => {
const metaFilePath = getMetaFileLocationForDir(
diff --git a/src/renderer/services/utils-io.ts b/src/renderer/services/utils-io.ts
index 05a6c1655..cf7a477ac 100644
--- a/src/renderer/services/utils-io.ts
+++ b/src/renderer/services/utils-io.ts
@@ -17,8 +17,6 @@
*/
import { getUuid } from '@tagspaces/tagspaces-common/utils-io';
-import { marked } from 'marked';
-import DOMPurify from 'dompurify';
import {
createIndex,
loadIndex,
@@ -57,7 +55,7 @@ import { generateImageThumbnail } from '-/services/thumbsgenerator';
import { base64ToArrayBuffer } from '-/utils/dom';
import { Pro } from '-/pro';
import { supportedFileTypes } from '-/extension-config';
-import { getEnhancedDir } from '-/services/meta-loader';
+import { getEnhancedDir, getEnhancedFile } from '-/services/meta-loader';
export function getAllTags(entry: TS.FileSystemEntry): Array<TS.Tag> {
const tags = [];
@@ -619,36 +617,7 @@ export function getAllPropertiesPromise(
if (!entryProps.isFile) {
return getEnhancedDir(entryProps);
}
-
- const metaFilePath = getMetaFileLocationForFile(
- entryPath,
- PlatformIO.getDirSeparator(),
- );
-
- try {
- return loadJSONFile(metaFilePath).then(
- (meta: TS.FileSystemEntryMeta) => {
- if (meta) {
- return enhanceEntry(
- { ...entryProps, meta },
- AppConfig.tagDelimiter,
- PlatformIO.getDirSeparator(),
- );
- }
- return enhanceEntry(
- entryProps,
- AppConfig.tagDelimiter,
- PlatformIO.getDirSeparator(),
- );
- },
- );
- } catch (e) {
- return enhanceEntry(
- entryProps,
- AppConfig.tagDelimiter,
- PlatformIO.getDirSeparator(),
- );
- }
+ return getEnhancedFile(entryProps);
}
console.log('Error getting props for ' + entryPath);
return entryProps;