Skip to content

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

external extensions fixes (#2222)

Stanimirb4fbf727ae98
diff --git a/.erb/configs/webpack.config.cordova.dev.ts b/.erb/configs/webpack.config.cordova.dev.ts
index 71968bd5c..d1defeb7a 100644
--- a/.erb/configs/webpack.config.cordova.dev.ts
+++ b/.erb/configs/webpack.config.cordova.dev.ts
@@ -247,7 +247,7 @@ const configuration: webpack.Configuration = {
filename: path.join('index.html'),
template: path.join(webpackPaths.srcRendererPath, 'index.ejs'),
templateParameters: {
- csp: "connect-src files: *; default-src 'self' ; object-src 'none' ; font-src 'self'; script-src 'self' 'unsafe-eval'; style-src 'self' 'unsafe-inline' data: blob: ; media-src * blob: ; img-src * blob: data: content:;",
+ csp: "connect-src files: *; frame-src 'self' tsfile: *; default-src 'self' ; object-src 'none' ; font-src 'self'; script-src 'self' 'unsafe-eval'; style-src 'self' 'unsafe-inline' data: blob: ; media-src * blob: ; img-src * blob: data: content:;",
},
minify: {
collapseWhitespace: true,
diff --git a/.erb/configs/webpack.config.cordova.prod.ts b/.erb/configs/webpack.config.cordova.prod.ts
index 2a5131b5b..5ec0b4335 100644
--- a/.erb/configs/webpack.config.cordova.prod.ts
+++ b/.erb/configs/webpack.config.cordova.prod.ts
@@ -264,7 +264,7 @@ const configuration: webpack.Configuration = {
filename: path.join('index.html'),
template: path.join(webpackPaths.srcRendererPath, 'index.ejs'),
templateParameters: {
- csp: "connect-src files: *; default-src 'self' ; object-src 'none' ; font-src 'self'; script-src 'self' 'unsafe-eval'; style-src 'self' 'unsafe-inline' data: blob: ; media-src * blob: ; img-src * blob: data: content:;",
+ csp: "connect-src files: *; frame-src 'self' tsfile: *; default-src 'self' ; object-src 'none' ; font-src 'self'; script-src 'self' 'unsafe-eval'; style-src 'self' 'unsafe-inline' data: blob: ; media-src * blob: ; img-src * blob: data: content:;",
},
minify: {
collapseWhitespace: true,
diff --git a/.erb/configs/webpack.config.renderer.dev.ts b/.erb/configs/webpack.config.renderer.dev.ts
index ad1a435b7..8773ca0c8 100644
--- a/.erb/configs/webpack.config.renderer.dev.ts
+++ b/.erb/configs/webpack.config.renderer.dev.ts
@@ -170,7 +170,7 @@ const configuration: webpack.Configuration = {
filename: path.join('index.html'),
template: path.join(webpackPaths.srcRendererPath, 'index.ejs'),
templateParameters: {
- csp: "connect-src files: *; default-src 'self' ; object-src 'none' ; script-src 'self' 'unsafe-eval'; style-src 'self' 'unsafe-inline' data: blob: ; media-src * blob: ; img-src * blob: data: content:;",
+ csp: "connect-src files: *; frame-src 'self' tsfile: *; default-src 'self' ; object-src 'none' ; script-src 'self' 'unsafe-eval'; style-src 'self' 'unsafe-inline' data: blob: ; media-src * blob: ; img-src * blob: data: content:;",
},
minify: {
collapseWhitespace: true,
diff --git a/.erb/configs/webpack.config.renderer.prod.ts b/.erb/configs/webpack.config.renderer.prod.ts
index 926b36ee3..3bb58c1a4 100644
--- a/.erb/configs/webpack.config.renderer.prod.ts
+++ b/.erb/configs/webpack.config.renderer.prod.ts
@@ -132,7 +132,7 @@ const configuration: webpack.Configuration = {
filename: 'index.html',
template: path.join(webpackPaths.srcRendererPath, 'index.ejs'),
templateParameters: {
- csp: "connect-src files: *; default-src 'self' ; object-src 'none' ; font-src 'self'; script-src 'self' ; style-src 'self' 'unsafe-inline' data: blob: ; media-src * blob: ; img-src * blob: data: content:;",
+ csp: "connect-src files: *; frame-src 'self' tsfile: *; default-src 'self' ; object-src 'none' ; font-src 'self'; script-src 'self' ; style-src 'self' 'unsafe-inline' data: blob: ; media-src * blob: ; img-src * blob: data: content:;",
},
minify: {
collapseWhitespace: true,
diff --git a/.gitignore b/.gitignore
index a948bd6ad..b982f3c51 100644
--- a/.gitignore
+++ b/.gitignore
@@ -136,3 +136,4 @@ docker/*.zip
tx
tagspsacespro
+third-party
diff --git a/package.json b/package.json
index 124b203d2..47c5b839d 100644
--- a/package.json
+++ b/package.json
@@ -103,9 +103,11 @@
"prepare-cordova": "npm run install-ext-web-check && npm run postinstall-cordova-check && rimraf cordova/www/dist && rimraf cordova/www/node_modules && shx cp -rL release/app/node_modules cordova/www && shx cp LICENSE.txt cordova/www",
"prepare-cordova-pro": "npm run install-ext-web-check && npm run postinstall-cordova-check && rimraf cordova/www/dist && rimraf cordova/www/node_modules && shx cp -rL release/app/node_modules cordova/www && shx cp node_modules/@tagspacespro/tagspacespro/EULA.txt cordova/www",
"prepare-node": "npm run install-ext-node-check && npm run postinstall-electron-check",
- "prepare-web": "npm run install-ext-web-check && npm run postinstall-aws-check && rimraf web/modules && shx mkdir -p web/modules/@tagspaces/extensions && shx cp -rL release/app/node_modules/@tagspaces/extensions/* web/modules/@tagspaces/extensions/ && shx cp LICENSE.txt web && npm run build:web && node scripts/genswconf.js && npm run clean-maps",
- "prepare-web-pro": "npm run install-ext-web-check && npm run postinstall-aws-check && rimraf web/modules && shx mkdir -p web/modules/@tagspaces/extensions && shx cp -rL release/app/node_modules/@tagspaces/extensions/* web/modules/@tagspaces/extensions/ && npm run prepare-web-pro-ext && shx cp node_modules/@tagspacespro/tagspacespro/EULA.txt web && npm run build:web && node scripts/genswconf.js && npm run clean-maps",
- "prepare-web-pro-dev": "npm run install-ext-web-check && npm run postinstall-aws-check && rimraf web/modules && shx mkdir -p web/modules/@tagspaces/extensions && shx cp -rL release/app/node_modules/@tagspaces/extensions/* web/modules/@tagspaces/extensions/ && npm run prepare-web-pro-ext && shx cp node_modules/@tagspacespro/tagspacespro/EULA.txt web && npm run build:web:dev && node scripts/genswconf.js",
+ "copy-web": "npm run install-ext-web-check && npm run postinstall-aws-check && rimraf web/modules && shx mkdir -p web/modules/@tagspaces/extensions && shx cp -rL release/app/node_modules/@tagspaces/extensions/* web/modules/@tagspaces/extensions/",
+ "prepare-web": "npm run copy-web && shx cp LICENSE.txt web && npm run build:web && node scripts/genswconf.js && npm run clean-maps",
+ "copy-web-pro": "npm run copy-web && npm run prepare-web-pro-ext && shx cp node_modules/@tagspacespro/tagspacespro/EULA.txt web",
+ "prepare-web-pro": "npm run copy-web-pro && npm run build:web && node scripts/genswconf.js && npm run clean-maps",
+ "prepare-web-pro-dev": "npm run copy-web-pro && npm run build:web:dev && node scripts/genswconf.js",
"prepare-web-pro-ext": "shx mkdir -p web/modules/@tagspacespro/extensions && shx cp -rL release/app/node_modules/@tagspacespro/extensions/* web/modules/@tagspacespro/extensions/",
"prettier-check": "prettier --check --ignore-path=.prettierignore \"**/*.{js,jsx,json,ts,tsx,yml}\"",
"prettier-format": "prettier --ignore-path=.prettierignore --write \"**/*.{js,jsx,json,ts,tsx,yml}\"",
@@ -115,8 +117,11 @@
"run-electron": "npx electron ./release/app/dist/main/main.js",
"run-ios-dev": "npm run prepare-cordova && npm run build:cordova:dev && cd cordova && cordova run ios && cd ..",
"run-web": "npm run prepare-web-pro && node scripts/webserver.js",
+ "run-web-extensions": "npm run copy-web-pro && npm run copy-web-extensions && npm run gen-third-party-extensions && npm run build:web && node scripts/genswconf.js && node scripts/webserver.js",
+ "copy-web-extensions": "shx mkdir -p web/modules/@tagspaces/extensions/arithmetic-player && shx cp -rL web/third-party/extensions/@tagspacesarithmetic-player_1.0.0/* web/modules/@tagspaces/extensions/arithmetic-player/",
+ "gen-third-party-extensions": "node -r ts-node/register scripts/generateExtensionsConfig.ts ./web/third-party/extensions",
"run-web-aws": "npm run prepare-web-pro && node scripts/webserver.js",
- "run-web-dev": "npm run prepare-web-pro-dev && node scripts/webserver.js",
+ "run-web-dev": "npm run prepare-web-pro-dev && shx cp scripts/extconfig-extensions.js web/extconfig.js && node scripts/webserver.js",
"run-web-server": "node scripts/webserver.js",
"setup-tests": "node scripts/setup-tests.js",
"skip:husky:pre-commit": "node -e \"require('fs').rename('./.git/hooks/pre-commit', './.git/hooks/pre-commit.disabled', function(err) { if (err) console.log(err); console.log('File successfully renamed!') })\"",
diff --git a/scripts/extconfig-extensions.js b/scripts/extconfig-extensions.js
new file mode 100644
index 000000000..b1f947fbd
--- /dev/null
+++ b/scripts/extconfig-extensions.js
@@ -0,0 +1,19 @@
+window.ExtIsFirstRun = false;
+window.ExtCheckForUpdatesOnStartup = false;
+window.ExtUseGenerateThumbnails = true;
+window.ExtExtensionsFound = [
+ {
+ extensionId: '@tagspaces/arithmetic-player',
+ extensionName: 'Mental Arithmetic',
+ extensionTypes: ['viewer'],
+ extensionEnabled: true,
+ version: '1.0.0',
+ },
+];
+window.ExtSupportedFileTypes = [
+ {
+ type: 'math',
+ color: '#5cb85c',
+ viewer: 'third-party/extensions/@tagspacesarithmetic-player_1.0.0/build',
+ },
+];
diff --git a/scripts/generateExtensionsConfig.ts b/scripts/generateExtensionsConfig.ts
index 4f2547736..3a3c7209b 100644
--- a/scripts/generateExtensionsConfig.ts
+++ b/scripts/generateExtensionsConfig.ts
@@ -1,6 +1,8 @@
import fs from 'fs';
import path from 'path';
import { getExtensions } from '../src/main/extension-utils';
+//import { unZip } from '@tagspaces/tagspaces-common-node/io-node';
+//import { Extensions } from "../src/main/types";
// const os = require('os');
let directoryPath = path.join(
@@ -11,9 +13,14 @@ let directoryPath = path.join(
'node_modules',
);
+const args = process.argv.slice(2);
+/*extractZips(args).then(() => {
+
+})*/
getExtensions(directoryPath, [
'@tagspaces/extensions',
'@tagspacespro/extensions',
+ ...(args.length > 0 ? args : []),
])
.then(({ extensions, supportedFileTypes }) => {
writeExtensions(extensions, supportedFileTypes);
@@ -57,6 +64,67 @@ function writeExtensions(extensions, supportedFileTypes) {
});
}
+/*async function extractZips(dirs: string[]): Promise<boolean> {
+ return new Promise((resolve, reject) => {
+ const promises = dirs.map(dir => extractZip(dir, path.join(dir, 'extensions')));
+ Promise.allSettled(promises).then((results) => {
+ const fulfilledResults = results
+ .filter((result) => result.status === 'fulfilled')
+ .map((result) => (result as PromiseFulfilledResult<Extensions>).value);
+ console.log(fulfilledResults);
+ resolve(true);
+ });
+ });
+}*/
+/**
+ * Extract all ZIP files in a given directory.
+ * @param directoryPath - Path to the directory containing ZIP files.
+ * @param outputDirectory - Path to the directory where files will be extracted.
+ * @returns Promise<void> - Resolves when all files are extracted.
+ */
+/*const extractZip = (
+ directoryPath: string,
+ outputDirectory: string
+): Promise<boolean> => {
+ return new Promise((resolve, reject) => {
+ // Ensure the output directory exists
+ if (!fs.existsSync(outputDirectory)) {
+ fs.mkdirSync(outputDirectory, { recursive: true });
+ }
+
+ // Read all files in the directory
+ fs.readdir(directoryPath, { withFileTypes: true }, (err, files) => {
+ if (err) {
+ console.log('Error reading directory:', err);
+ //reject(err);
+ resolve(false);
+ return;
+ }
+
+ // Filter for ZIP files only
+ const zipFiles = files.filter(file => path.extname(file.name).toLowerCase() === '.zip');
+ if (zipFiles.length === 0) {
+ resolve(true);
+ return;
+ }
+
+ // Process each ZIP file
+ const promises = zipFiles.map(file => {
+ const zipPath = path.join(directoryPath, file.parentPath);
+ const extractPath = path.join(outputDirectory, path.basename(file.parentPath, '.zip'));
+ return unZip(zipPath, extractPath);
+ });
+ Promise.allSettled(promises).then((results) => {
+ const fulfilledResults = results
+ .filter((result) => result.status === 'fulfilled')
+ .map((result) => (result as PromiseFulfilledResult<Extensions>).value);
+ console.log(fulfilledResults);
+ resolve(true);
+ });
+ });
+ });
+};*/
+
/*function getUserDataPath() {
switch (process.platform) {
case 'darwin':
diff --git a/src/main/extension-utils.ts b/src/main/extension-utils.ts
index 87ccda237..06e2f0a20 100644
--- a/src/main/extension-utils.ts
+++ b/src/main/extension-utils.ts
@@ -16,7 +16,9 @@ export function getExtensions(
const promises = packages.map(
(packagePath) =>
new Promise((resolve, reject) => {
- const extPath = path.join(nodeModulesPath, packagePath);
+ const extPath = packagePath.startsWith('.')
+ ? packagePath
+ : path.join(nodeModulesPath, packagePath);
fs.readdir(extPath, { withFileTypes: true }, (err, files) => {
if (err) {
console.log('Error reading directory:', err);
@@ -70,12 +72,9 @@ function processDirs(
const supportedFileTypes = [];
const extensions = dirs.map((dir) => {
- const pluginJsonPath = path.join(
- directoryPath,
- packagePath,
- dir.name,
- 'package.json',
- );
+ const pluginJsonPath = packagePath.startsWith('.')
+ ? path.join(packagePath, dir.name, 'package.json')
+ : path.join(directoryPath, packagePath, dir.name, 'package.json');
try {
const packageJsonContent = fs.readFileSync(pluginJsonPath, 'utf8');
const packageJsonObj = JSON.parse(packageJsonContent);
diff --git a/src/renderer/components/EntryContainer.tsx b/src/renderer/components/EntryContainer.tsx
index 55b37e20a..1bba1f0ea 100644
--- a/src/renderer/components/EntryContainer.tsx
+++ b/src/renderer/components/EntryContainer.tsx
@@ -234,15 +234,19 @@ function EntryContainer() {
// editor is not loaded in this time - change theme after loadDefaultTextContent
useEffect(() => {
- if (
- fileViewer &&
- fileViewer.current &&
- fileViewer.current.contentWindow &&
- // @ts-ignore
- fileViewer.current.contentWindow.setTheme
- ) {
- // @ts-ignore call setContent from iframe
- fileViewer.current.contentWindow.setTheme(theme.palette.mode);
+ try {
+ if (
+ fileViewer &&
+ fileViewer.current &&
+ fileViewer.current.contentWindow &&
+ // @ts-ignore
+ fileViewer.current.contentWindow.setTheme
+ ) {
+ // @ts-ignore call setContent from iframe
+ fileViewer.current.contentWindow.setTheme(theme.palette.mode);
+ }
+ } catch (e) {
+ console.log('Error setTheme', e);
}
}, [theme.palette.mode]); //settings.currentTheme
@@ -285,6 +289,48 @@ function EntryContainer() {
case 'saveDocument':
savingFile(data.force !== undefined ? data.force : false);
break;
+ case 'parentSaveDocument':
+ try {
+ isSavingInProgress.current = true;
+ forceUpdate();
+ saveFileOpen(openedEntry, JSON.stringify(data.content)).then(
+ (success) => {
+ if (success) {
+ setFileChanged(false);
+ // showNotification(
+ // t('core:fileSavedSuccessfully'),
+ // NotificationTypes.default
+ // );
+ }
+ // change state will not render DOT before file name too
+ isSavingInProgress.current = false;
+ },
+ );
+ } catch (e) {
+ isSavingInProgress.current = false;
+ console.debug('parentSaveDocument:', e);
+ }
+ break;
+ case 'parentLoadTextContent':
+ if (
+ fileViewer &&
+ fileViewer.current &&
+ fileViewer.current.contentWindow
+ ) {
+ cLocation
+ .loadTextFilePromise(openedEntry.path, false)
+ .then((content) => {
+ // Check and remove UTF-8 BOM
+ const cleanedContent = content.startsWith('\uFEFF')
+ ? content.slice(1)
+ : content;
+ fileViewer.current.contentWindow.postMessage(
+ { action: 'fileContent', content: cleanedContent },
+ '*',
+ );
+ });
+ }
+ break;
case 'editDocument':
if (editingSupported) {
editOpenedFile();
@@ -303,15 +349,19 @@ function EntryContainer() {
}
filePath = openedEntry.path;
- if (
- fileViewer &&
- fileViewer.current &&
- fileViewer.current.contentWindow &&
- // @ts-ignore
- fileViewer.current.contentWindow.setTheme
- ) {
- // @ts-ignore call setContent from iframe
- fileViewer.current.contentWindow.setTheme(theme.palette.mode);
+ try {
+ if (
+ fileViewer &&
+ fileViewer.current &&
+ fileViewer.current.contentWindow &&
+ // @ts-ignore
+ fileViewer.current.contentWindow.setTheme
+ ) {
+ // @ts-ignore call setContent from iframe
+ fileViewer.current.contentWindow.setTheme(theme.palette.mode);
+ }
+ } catch (e) {
+ console.log('Error setTheme', e);
}
// TODO make loading index.html for folders configurable
// if (!this.state.currentEntry.isFile) {
diff --git a/src/renderer/components/dialogs/components/SettingsExtensions.tsx b/src/renderer/components/dialogs/components/SettingsExtensions.tsx
index 1a63c9d1a..5a94282b3 100644
--- a/src/renderer/components/dialogs/components/SettingsExtensions.tsx
+++ b/src/renderer/components/dialogs/components/SettingsExtensions.tsx
@@ -59,7 +59,15 @@ function SettingsExtensions() {
};
const handleFileInputChange = (selection: any) => {
- const files: File[] = Array.from(selection.currentTarget.files);
+ let files: File[] = Array.from(selection.currentTarget.files);
+ if (AppConfig.isElectron) {
+ files = files.map((file) => {
+ if (!file.path) {
+ file.path = window.electronIO.ipcRenderer.getPathForFile(file);
+ }
+ return file;
+ });
+ }
getUserDataDir().then((dataDir) => {
dispatch(AppActions.resetProgress());
openFileUploadDialog();
diff --git a/src/renderer/components/dialogs/components/SettingsFileTypes.tsx b/src/renderer/components/dialogs/components/SettingsFileTypes.tsx
index 3f66507ac..e5491cd78 100644
--- a/src/renderer/components/dialogs/components/SettingsFileTypes.tsx
+++ b/src/renderer/components/dialogs/components/SettingsFileTypes.tsx
@@ -49,7 +49,7 @@ import {
} from '-/reducers/settings';
import ConfirmDialog from '-/components/dialogs/ConfirmDialog';
import { AppDispatch } from '-/reducers/app';
-import { supportedFileTypes as defaultSupportedFileTypes } from '-/extension-config';
+import defaultSettings from '-/reducers/settings-default';
import useFirstRender from '-/utils/useFirstRender';
import { useTranslation } from 'react-i18next';
import { getUserDataDir } from '-/services/utils-io';
@@ -500,7 +500,7 @@ function SettingsFileTypes() {
data-tid="resetFileTypesTID"
onClick={() => {
selectedItem.current = undefined;
- items.current = defaultSupportedFileTypes;
+ items.current = defaultSettings.supportedFileTypes;
dispatch(SettingsActions.setSupportedFileTypes(supportedFileTypes));
}}
color="secondary"
diff --git a/src/renderer/hooks/ExtensionsContextProvider.tsx b/src/renderer/hooks/ExtensionsContextProvider.tsx
index bd1526964..13f447172 100644
--- a/src/renderer/hooks/ExtensionsContextProvider.tsx
+++ b/src/renderer/hooks/ExtensionsContextProvider.tsx
@@ -25,11 +25,13 @@ import React, {
} from 'react';
import { AppDispatch } from '-/reducers/app';
import AppConfig from '-/AppConfig';
-import { actions as SettingsActions } from '-/reducers/settings';
+import {
+ actions as SettingsActions,
+ getExtensionsFound,
+} from '-/reducers/settings';
import { Extensions } from '../../main/types';
import { TS } from '-/tagspaces.namespace';
-import { extensionsFound } from '-/extension-config';
-import { useDispatch } from 'react-redux';
+import { useDispatch, useSelector } from 'react-redux';
import { mergeByProp } from '-/services/utils-io';
type ExtensionsContextData = {
@@ -56,6 +58,7 @@ export const ExtensionsContextProvider = ({
children,
}: ExtensionsContextProviderProps) => {
const dispatch: AppDispatch = useDispatch();
+ const extensionsFound = useSelector(getExtensionsFound);
const extensions = useRef<TS.Extension[]>(extensionsFound);
const [ignored, forceUpdate] = useReducer((x) => x + 1, 0, undefined);
const enableExtensionsKey = 'ENABLE_EXTENSION';
diff --git a/src/renderer/hooks/OpenedEntryContextProvider.tsx b/src/renderer/hooks/OpenedEntryContextProvider.tsx
index a16fcadcf..53fd3cfd1 100644
--- a/src/renderer/hooks/OpenedEntryContextProvider.tsx
+++ b/src/renderer/hooks/OpenedEntryContextProvider.tsx
@@ -1004,13 +1004,13 @@ export const OpenedEntryContextProvider = ({
}
fileForOpening.viewingExtensionPath = findExtensionPathForId(
fileType.viewer,
- //fileType.extensionExternalPath,
+ fileType.extensionExternalPath,
);
if (fileType.editor && fileType.editor.length > 0) {
fileForOpening.editingExtensionId = fileType.editor;
fileForOpening.editingExtensionPath = findExtensionPathForId(
fileType.editor,
- //fileType.extensionExternalPath,
+ fileType.extensionExternalPath,
);
}
} else {
diff --git a/src/renderer/reducers/settings-default.ts b/src/renderer/reducers/settings-default.ts
index 3138ecd13..566d008b9 100644
--- a/src/renderer/reducers/settings-default.ts
+++ b/src/renderer/reducers/settings-default.ts
@@ -20,7 +20,7 @@ import AppConfig from '-/AppConfig';
import keyBindings from '-/reducers/keybindings-default';
import { PerspectiveIDs } from '-/perspectives';
import { getUuid } from '@tagspaces/tagspaces-common/utils-io';
-import { supportedFileTypes } from '-/extension-config';
+import { supportedFileTypes, extensionsFound } from '-/extension-config';
let desktopMode = !AppConfig.isMobile;
if (window.ExtDisplayMode && window.ExtDisplayMode === 'mobile') {
@@ -226,7 +226,12 @@ export default {
},
],
keyBindings: keyBindings(AppConfig.isMacLike),
- supportedFileTypes: supportedFileTypes,
+ supportedFileTypes: window.ExtSupportedFileTypes
+ ? [...supportedFileTypes, ...window.ExtSupportedFileTypes]
+ : supportedFileTypes,
+ extensionsFound: window.ExtExtensionsFound
+ ? [...extensionsFound, ...window.ExtExtensionsFound]
+ : extensionsFound,
enabledExtensions: [],
mapTileServers: [
{
diff --git a/src/renderer/reducers/settings.ts b/src/renderer/reducers/settings.ts
index 102f89d0a..79f5bd63d 100644
--- a/src/renderer/reducers/settings.ts
+++ b/src/renderer/reducers/settings.ts
@@ -1026,6 +1026,8 @@ export const getSupportedFileTypes = (state: any) =>
state.settings.supportedFileTypes.sort((a, b) =>
a.type > b.type ? 1 : a.type < b.type ? -1 : 0,
);
+export const getExtensionsFound = (state: any) =>
+ state.settings.extensionsFound;
export const getTagColor = (state: any) => state.settings.tagBackgroundColor;
export const getTagTextColor = (state: any) => state.settings.tagTextColor;
export const getCurrentTheme = (state: any) => state.settings.currentTheme;
diff --git a/src/renderer/services/utils-io.ts b/src/renderer/services/utils-io.ts
index d3de47653..8e637044b 100644
--- a/src/renderer/services/utils-io.ts
+++ b/src/renderer/services/utils-io.ts
@@ -16,7 +16,6 @@
*/
import AppConfig from '-/AppConfig';
-import { supportedFileTypes } from '-/extension-config';
import { TS } from '-/tagspaces.namespace';
import { CommonLocation } from '-/utils/CommonLocation';
import { prepareTagForExport } from '@tagspaces/tagspaces-common/misc';
@@ -30,6 +29,7 @@ import {
import { getUuid } from '@tagspaces/tagspaces-common/utils-io';
import { saveAs } from 'file-saver';
import removeMd from 'remove-markdown';
+import defaultSettings from '-/reducers/settings-default';
import versionMeta from '../version.json';
export const instanceId = getUuid();
@@ -158,7 +158,13 @@ export function findExtensionPathForId(
extensionExternalPath = undefined,
): string {
if (extensionExternalPath) {
- return extensionExternalPath + '/' + extensionId;
+ return (
+ AppConfig.mediaProtocol +
+ ':///' +
+ extensionExternalPath +
+ '/' +
+ extensionId
+ );
}
if (AppConfig.isWeb) {
return 'modules/' + extensionId;
@@ -792,14 +798,18 @@ export function mergeFsEntryMeta(props: any = {}): TS.FileSystemEntryMeta {
}*/
export function getDefaultViewer(fileType) {
- const type = supportedFileTypes.find((fType) => fType.type === fileType);
+ const type = defaultSettings.supportedFileTypes.find(
+ (fType) => fType.type === fileType,
+ );
if (type) {
return type.viewer;
}
return undefined;
}
export function getDefaultEditor(fileType) {
- const type = supportedFileTypes.find((fType) => fType.type === fileType);
+ const type = defaultSettings.supportedFileTypes.find(
+ (fType) => fType.type === fileType,
+ );
if (type) {
return type.editor;
}
diff --git a/src/renderer/tagspaces.d.ts b/src/renderer/tagspaces.d.ts
index 5dad52847..48540720d 100644
--- a/src/renderer/tagspaces.d.ts
+++ b/src/renderer/tagspaces.d.ts
@@ -70,6 +70,8 @@ declare interface Window {
plugins?: any; // needed for Cordova
resolveLocalFileSystemURL?: any; // needed for Cordova
device?: any; // needed for Cordova
+ ExtSupportedFileTypes?: Array<any>;
+ ExtExtensionsFound?: Array<any>;
}
declare interface NodeModule {
diff --git a/src/renderer/tagspaces.namespace.d.ts b/src/renderer/tagspaces.namespace.d.ts
index 08aff956a..760869071 100644
--- a/src/renderer/tagspaces.namespace.d.ts
+++ b/src/renderer/tagspaces.namespace.d.ts
@@ -80,6 +80,7 @@ export namespace TS {
viewer: string;
editor?: string;
color?: string;
+ extensionExternalPath?: string;
}
interface DirProp {
diff --git a/web/README.md b/web/README.md
new file mode 100644
index 000000000..bdcc0f924
--- /dev/null
+++ b/web/README.md
@@ -0,0 +1,29 @@
+### Install third party extensions in web
+
+download [zip](https://github.com/sytolk/mental-arithmetic/releases) and extract extension in folder `web/modules/third-party/extensions`
+
+if extracted extension folder is `@tagspacesarithmetic-player_1.0.0`
+
+extension path will be: `web/modules/third-party/extensions/@tagspacesarithmetic-player_1.0.0`
+
+add this configuration to `web/extconfig.js`
+
+```javascript
+window.ExtExtensionsFound = [
+ {
+ extensionId: '@tagspaces/arithmetic-player',
+ extensionName: 'Mental Arithmetic',
+ extensionTypes: ['viewer'],
+ extensionEnabled: true,
+ version: '1.0.0',
+ },
+];
+window.ExtSupportedFileTypes = [
+ {
+ type: 'math',
+ color: '#5cb85c',
+ viewer: 'third-party/extensions/@tagspacesarithmetic-player_1.0.0/build',
+ },
+];
+```
+note: to update extensions list it's need to delete web browser application data