TagSpaces is an offline, open source, document manager with tagging support
Merge remote-tracking branch 'origin/develop' into Migrate-to-a-newer-react-electron-boilerplate
sytolkb5ca0072d30b
diff --cc src/renderer/services/utils-io.tsindex ac7a43b08,7957b7ffa..83cbd8fc3--- a/src/renderer/services/utils-io.ts+++ b/src/renderer/services/utils-io.ts@@@ -305,58 -305,44 +305,49 @@@ export function findExtensionPathForIdif (AppConfig.isWeb) {return 'modules/' + extensionId;}- return 'node_modules/' + extensionId;+ if (AppConfig.isCordova) {+ return 'node_modules/' + extensionId;+ }+ return process.env.NODE_ENV === 'development'+ ? 'modules/' + extensionId+ : '../../node_modules/' + extensionId;}- export function findExtensionsForEntry(- uuid: string,- supportedFileTypes: Array<any>,- entryPath: string,- isFile = true,+ export function addExtensionsForEntry(+ openedEntry: OpenedEntry,+ supportedFileTypes: Array<TS.FileTypes>,): OpenedEntry {const fileExtension = extractFileExtension(- entryPath,+ openedEntry.path,PlatformIO.getDirSeparator(),).toLowerCase();- const viewingExtensionPath = isFile- ? findExtensionPathForId('@tagspaces/extensions/text-viewer')- : 'about:blank';- const fileForOpening: OpenedEntry = {- uuid: uuid,- path: entryPath,- viewingExtensionPath,- viewingExtensionId: '',- isFile,- // changed: false,- locationId: undefined,- lmdt: 0,- size: 0,- };- supportedFileTypes.map((fileType) => {- if (fileType.viewer && fileType.type.toLowerCase() === fileExtension) {- fileForOpening.viewingExtensionId = fileType.viewer;- if (fileType.color) {- fileForOpening.color = fileType.color;- }- fileForOpening.viewingExtensionPath = findExtensionPathForId(- fileType.viewer,- fileType.extensionExternalPath,++ const fileForOpening = { ...openedEntry };+ const fileType: TS.FileTypes = supportedFileTypes.find(+ (fileType) =>+ fileType.viewer && fileType.type.toLowerCase() === fileExtension,+ );+ if (fileType) {+ fileForOpening.viewingExtensionId = fileType.viewer;+ if (fileType.color) {+ fileForOpening.color = fileType.color;+ }+ fileForOpening.viewingExtensionPath = findExtensionPathForId(+ fileType.viewer,+ //fileType.extensionExternalPath,+ );+ if (fileType.editor && fileType.editor.length > 0) {+ fileForOpening.editingExtensionId = fileType.editor;+ fileForOpening.editingExtensionPath = findExtensionPathForId(+ fileType.editor,+ //fileType.extensionExternalPath,);- if (fileType.editor && fileType.editor.length > 0) {- fileForOpening.editingExtensionId = fileType.editor;- fileForOpening.editingExtensionPath = findExtensionPathForId(- fileType.editor,- fileType.extensionExternalPath,- );- }}- return true;- });+ } else {+ fileForOpening.viewingExtensionPath = openedEntry.isFile+ ? findExtensionPathForId('@tagspaces/extensions/text-viewer')+ : 'about:blank';+ }return fileForOpening;}