Skip to content

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

Extension nextgen (#1496)

Ilian89fa2ec46ad5
diff --git a/.tx/config b/.tx/config
index 5f604e6d4..b1e1b83ee 100644
--- a/.tx/config
+++ b/.tx/config
@@ -7,27 +7,27 @@ source_lang = en
type = KEYVALUEJSON
[tagspaces.nsviewerimagejson]
-file_filter = extensions/viewerImage/locales/<lang>/ns.viewerImage.json
+file_filter = extensions/extensions/viewerImage/locales/<lang>/ns.viewerImage.json
source_lang = en
type = KEYVALUEJSON
[tagspaces.nsviewermdjson]
-file_filter = extensions/viewerMD/locales/<lang>/ns.viewerMD.json
+file_filter = extensions/extensions/viewerMD/locales/<lang>/ns.viewerMD.json
source_lang = en
type = KEYVALUEJSON
[tagspaces.nsviewerhtmljson]
-file_filter = extensions/viewerHTML/locales/<lang>/ns.viewerHTML.json
+file_filter = extensions/extensions/viewerHTML/locales/<lang>/ns.viewerHTML.json
source_lang = en
type = KEYVALUEJSON
[tagspaces.nsviewermhtmljson]
-file_filter = extensions/viewerMHTML/locales/<lang>/ns.viewerMHTML.json
+file_filter = extensions/extensions/viewerMHTML/locales/<lang>/ns.viewerMHTML.json
source_lang = en
type = KEYVALUEJSON
[tagspaces.nseditortextjson]
-file_filter = extensions/editorText/locales/<lang>/ns.editorText.json
+file_filter = extensions/extensions/editorText/locales/<lang>/ns.editorText.json
source_lang = en
type = KEYVALUEJSON
diff --git a/app/package.json b/app/package.json
index 8b5f9a6e9..b2c0fc1bd 100644
--- a/app/package.json
+++ b/app/package.json
@@ -12,22 +12,6 @@
},
"license": "AGPL-3.0",
"dependencies": {
- "@tagspaces/archive-viewer": "https://github.com/tagspaces/viewerZIP#master",
- "@tagspaces/document-viewer": "https://github.com/tagspaces/viewerDocument#master",
- "@tagspaces/html-editor": "https://github.com/tagspaces/editorHTML#master",
- "@tagspaces/html-viewer": "https://github.com/tagspaces/viewerHTML#master",
- "@tagspaces/image-viewer": "https://github.com/tagspaces/viewerImage#master",
- "@tagspaces/json-editor": "https://github.com/tagspaces/editorJSON#master",
- "@tagspaces/legacy-ext": "https://github.com/tagspaces/extCommons#master",
- "@tagspaces/md-viewer": "https://github.com/tagspaces/viewerMD#master",
- "@tagspaces/media-player": "https://github.com/tagspaces/viewerAudioVideo#master",
- "@tagspaces/mhtml-viewer": "https://github.com/tagspaces/viewerMHTML#master",
- "@tagspaces/pdf-viewer": "https://github.com/tagspaces/viewerPDF#master",
- "@tagspaces/plain-viewer": "https://github.com/tagspaces/viewerBrowser#master",
- "@tagspaces/rtf-viewer": "https://github.com/tagspaces/viewerRTF#master",
- "@tagspaces/spreadsheet-viewer": "https://github.com/tagspaces/viewerSpreadSheet#master",
- "@tagspaces/text-editor": "https://github.com/tagspaces/editorText#master",
- "@tagspaces/text-viewer": "https://github.com/tagspaces/viewerText#master",
- "@tagspaces/url-viewer": "https://github.com/tagspaces/viewerURL#master"
+ "@tagspaces/tagspaces-extensions": "https://github.com/tagspaces/tagspaces-extensions#master"
}
}
diff --git a/app/reducers/settings-default.ts b/app/reducers/settings-default.ts
index 4e961faed..9b55c8efe 100644
--- a/app/reducers/settings-default.ts
+++ b/app/reducers/settings-default.ts
@@ -31,83 +31,87 @@ export function findAvailableExtensions() {
// Search in the installation folder
const extensionsFound = [
{
- extensionId: '@tagspaces/archive-viewer',
+ extensionId: '@tagspaces/extensions/archive-viewer',
extensionName: 'Archive Viewer',
extensionType: 'viewer'
},
{
- extensionId: '@tagspaces/document-viewer',
+ extensionId: '@tagspaces/extensions/3d-viewer',
+ extensionName: '3D Viewer',
+ extensionType: 'viewer'
+ },
+ {
+ extensionId: '@tagspaces/extensions/document-viewer',
extensionName: 'Documents Viewer',
extensionType: 'viewer'
},
- // { extensionId: '@tagspaces/ebook-viewer', extensionName: 'EPUB Viewer', extensionType: 'viewer' },
{
- extensionId: '@tagspaces/html-editor',
+ extensionId: '@tagspaces/extensions/html-editor',
extensionName: 'HTML Editor',
extensionType: 'editor'
},
{
- extensionId: '@tagspaces/html-viewer',
+ extensionId: '@tagspaces/extensions/html-viewer',
extensionName: 'HTML Viewer',
extensionType: 'viewer'
},
{
- extensionId: '@tagspaces/image-viewer',
+ extensionId: '@tagspaces/extensions/image-viewer',
extensionName: 'Image Viewer',
extensionType: 'viewer'
},
{
- extensionId: '@tagspaces/json-editor',
+ extensionId: '@tagspaces/extensions/json-editor',
extensionName: 'JSON Viewer',
extensionType: 'editor'
},
{
- extensionId: '@tagspaces/md-viewer',
+ extensionId: '@tagspaces/extensions/md-viewer',
extensionName: 'MarkDown Viewer',
extensionType: 'viewer'
},
{
- extensionId: '@tagspaces/media-player',
+ extensionId: '@tagspaces/extensions/md-editor/build',
+ extensionName: 'MarkDown Editor',
+ extensionType: 'editor'
+ },
+ {
+ extensionId: '@tagspaces/extensions/media-player',
extensionName: 'Media Player',
extensionType: 'viewer'
},
{
- extensionId: '@tagspaces/mhtml-viewer',
+ extensionId: '@tagspaces/extensions/mhtml-viewer',
extensionName: 'MHTML Viewer',
extensionType: 'viewer'
},
{
- extensionId: '@tagspaces/pdf-viewer',
+ extensionId: '@tagspaces/extensions/pdf-viewer',
extensionName: 'PDF Viewer',
extensionType: 'viewer'
},
- // {
- // extensionId: '@tagspaces/plain-viewer',
- // extensionName: 'Experimental Viewer (insecure)',
- // extensionType: 'viewer'
- // },
{
- extensionId: '@tagspaces/rtf-viewer',
+ extensionId: '@tagspaces/extensions/rtf-viewer',
extensionName: 'RTF Viewer',
extensionType: 'viewer'
},
{
- extensionId: '@tagspaces/spreadsheet-viewer',
+ extensionId: '@tagspaces/extensions/spreadsheet-viewer',
extensionName: 'Spreadsheet Viewer',
extensionType: 'viewer'
},
{
- extensionId: '@tagspaces/text-editor',
+ extensionId: '@tagspaces/extensions/text-editor',
extensionName: 'Text Editor',
extensionType: 'editor'
},
{
- extensionId: '@tagspaces/text-viewer',
+ extensionId: '@tagspaces/extensions/text-viewer',
extensionName: 'Text Viewer',
extensionType: 'viewer'
},
{
- extensionId: '@tagspaces/url-viewer',
+ extensionId: '@tagspaces/extensions/url-viewer',
extensionName: 'URL Viewer',
extensionType: 'viewer'
}
@@ -163,12 +167,6 @@ export default {
entryPropertiesSplitSize: 103,
leftVerticalSplitSize: 350,
mainVerticalSplitSize: '50%',
- /* supportedPerspectives: [
- {
- id: 'perspectiveList',
- name: 'List'
- }
- ], */
supportedThemes: ['light', 'dark'],
supportedLanguages: [
{
@@ -276,406 +274,401 @@ export default {
supportedFileTypes: [
{
type: 'bmp',
- viewer: '@tagspaces/image-viewer',
+ viewer: '@tagspaces/extensions/image-viewer',
color: '#9fd5ba'
},
{
type: 'c',
- viewer: '@tagspaces/text-editor',
- editor: '@tagspaces/text-editor',
+ viewer: '@tagspaces/extensions/text-editor',
+ editor: '@tagspaces/extensions/text-editor',
color: ''
},
{
type: 'clj',
- viewer: '@tagspaces/text-editor',
- editor: '@tagspaces/text-editor',
+ viewer: '@tagspaces/extensions/text-editor',
+ editor: '@tagspaces/extensions/text-editor',
color: ''
},
{
type: 'coffee',
- viewer: '@tagspaces/text-editor',
- editor: '@tagspaces/text-editor',
+ viewer: '@tagspaces/extensions/text-editor',
+ editor: '@tagspaces/extensions/text-editor',
color: ''
},
{
type: 'cpp',
- viewer: '@tagspaces/text-editor',
- editor: '@tagspaces/text-editor',
+ viewer: '@tagspaces/extensions/text-editor',
+ editor: '@tagspaces/extensions/text-editor',
color: ''
},
{
type: 'cs',
- viewer: '@tagspaces/text-editor',
- editor: '@tagspaces/text-editor',
+ viewer: '@tagspaces/extensions/text-editor',
+ editor: '@tagspaces/extensions/text-editor',
color: ''
},
{
type: 'css',
- viewer: '@tagspaces/text-editor',
- editor: '@tagspaces/text-editor',
+ viewer: '@tagspaces/extensions/text-editor',
+ editor: '@tagspaces/extensions/text-editor',
color: ''
},
{
type: 'desktop',
- viewer: '@tagspaces/url-viewer',
+ viewer: '@tagspaces/extensions/url-viewer',
color: ''
},
{
type: 'eml',
- viewer: '@tagspaces/mhtml-viewer',
+ viewer: '@tagspaces/extensions/mhtml-viewer',
color: ''
},
- // {
- // type: 'epub',
- // viewer: '@tagspaces/ebook-viewer',
- // color: ''
- // },
{
type: 'flac',
- viewer: '@tagspaces/media-player',
+ viewer: '@tagspaces/extensions/media-player',
color: ''
},
{
type: 'acc',
- viewer: '@tagspaces/media-player',
+ viewer: '@tagspaces/extensions/media-player',
color: ''
},
{
type: 'gif',
- viewer: '@tagspaces/image-viewer',
+ viewer: '@tagspaces/extensions/image-viewer',
color: '#9fd5ba'
},
{
type: 'groovy',
- viewer: '@tagspaces/text-editor',
- editor: '@tagspaces/text-editor',
+ viewer: '@tagspaces/extensions/text-editor',
+ editor: '@tagspaces/extensions/text-editor',
color: ''
},
{
type: 'h',
- viewer: '@tagspaces/text-editor',
- editor: '@tagspaces/text-editor',
+ viewer: '@tagspaces/extensions/text-editor',
+ editor: '@tagspaces/extensions/text-editor',
color: ''
},
{
type: 'haxe',
- viewer: '@tagspaces/text-editor',
- editor: '@tagspaces/text-editor',
+ viewer: '@tagspaces/extensions/text-editor',
+ editor: '@tagspaces/extensions/text-editor',
color: ''
},
{
type: 'htm',
- viewer: '@tagspaces/html-viewer',
- editor: '@tagspaces/html-editor',
+ viewer: '@tagspaces/extensions/html-viewer',
+ editor: '@tagspaces/extensions/html-editor',
color: '#beefed'
},
{
type: 'html',
- viewer: '@tagspaces/html-viewer',
- editor: '@tagspaces/html-editor',
+ viewer: '@tagspaces/extensions/html-viewer',
+ editor: '@tagspaces/extensions/html-editor',
color: ''
},
{
type: 'ico',
- viewer: '@tagspaces/image-viewer',
+ viewer: '@tagspaces/extensions/image-viewer',
color: '#9fd5ba'
},
{
type: 'java',
- viewer: '@tagspaces/text-editor',
- editor: '@tagspaces/text-editor',
+ viewer: '@tagspaces/extensions/text-editor',
+ editor: '@tagspaces/extensions/text-editor',
color: ''
},
{
type: 'jpeg',
- viewer: '@tagspaces/image-viewer',
+ viewer: '@tagspaces/extensions/image-viewer',
color: '#9fd5ba'
},
{
type: 'jpg',
- viewer: '@tagspaces/image-viewer',
+ viewer: '@tagspaces/extensions/image-viewer',
color: '#9fd5ba'
},
{
type: 'jif',
- viewer: '@tagspaces/image-viewer',
+ viewer: '@tagspaces/extensions/image-viewer',
color: '#9fd5ba'
},
{
type: 'jfif',
- viewer: '@tagspaces/image-viewer',
+ viewer: '@tagspaces/extensions/image-viewer',
color: '#9fd5ba'
},
{
type: 'js',
- viewer: '@tagspaces/text-editor',
- editor: '@tagspaces/text-editor',
+ viewer: '@tagspaces/extensions/text-editor',
+ editor: '@tagspaces/extensions/text-editor',
color: '#d7ff78'
},
{
type: 'jsm',
- viewer: '@tagspaces/text-editor',
- editor: '@tagspaces/text-editor',
+ viewer: '@tagspaces/extensions/text-editor',
+ editor: '@tagspaces/extensions/text-editor',
color: ''
},
{
type: 'json',
- viewer: '@tagspaces/json-editor',
- editor: '@tagspaces/json-editor',
+ viewer: '@tagspaces/extensions/json-editor',
+ editor: '@tagspaces/extensions/json-editor',
color: ''
},
{
type: 'less',
- viewer: '@tagspaces/text-editor',
- editor: '@tagspaces/text-editor',
+ viewer: '@tagspaces/extensions/text-editor',
+ editor: '@tagspaces/extensions/text-editor',
color: ''
},
{
type: 'lua',
- viewer: '@tagspaces/text-editor',
- editor: '@tagspaces/text-editor',
+ viewer: '@tagspaces/extensions/text-editor',
+ editor: '@tagspaces/extensions/text-editor',
color: ''
},
{
type: 'mkv',
- viewer: '@tagspaces/media-player',
+ viewer: '@tagspaces/extensions/media-player',
color: '#c5e4f9'
},
{
type: 'md',
- viewer: '@tagspaces/md-viewer',
- editor: '@tagspaces/text-editor',
+ viewer: '@tagspaces/extensions/md-viewer',
+ editor: '@tagspaces/extensions/text-editor',
color: '#beefed'
},
{
type: 'mdown',
- viewer: '@tagspaces/md-viewer',
- editor: '@tagspaces/text-editor',
+ viewer: '@tagspaces/extensions/md-viewer',
+ editor: '@tagspaces/extensions/text-editor',
color: '#beefed'
},
{
type: 'mdx',
- viewer: '@tagspaces/md-viewer',
- editor: '@tagspaces/text-editor',
+ viewer: '@tagspaces/extensions/md-viewer',
+ editor: '@tagspaces/extensions/text-editor',
color: '#beefed'
},
{
type: 'mht',
- viewer: '@tagspaces/mhtml-viewer',
+ viewer: '@tagspaces/extensions/mhtml-viewer',
color: ''
},
{
type: 'mhtml',
- viewer: '@tagspaces/mhtml-viewer',
+ viewer: '@tagspaces/extensions/mhtml-viewer',
color: ''
},
{
type: 'mkd',
- viewer: '@tagspaces/md-viewer',
- editor: '@tagspaces/text-editor',
+ viewer: '@tagspaces/extensions/md-viewer',
+ editor: '@tagspaces/extensions/text-editor',
color: ''
},
{
type: 'ml',
- viewer: '@tagspaces/text-editor',
- editor: '@tagspaces/text-editor',
+ viewer: '@tagspaces/extensions/text-editor',
+ editor: '@tagspaces/extensions/text-editor',
color: ''
},
{
type: 'mli',
- viewer: '@tagspaces/text-editor',
- editor: '@tagspaces/text-editor',
+ viewer: '@tagspaces/extensions/text-editor',
+ editor: '@tagspaces/extensions/text-editor',
color: ''
},
{
type: 'mp3',
- viewer: '@tagspaces/media-player',
+ viewer: '@tagspaces/extensions/media-player',
color: '#c5e4f9'
},
{
type: 'lrv',
- viewer: '@tagspaces/media-player',
+ viewer: '@tagspaces/extensions/media-player',
color: '#c5e4f9'
},
{
type: 'mp4',
- viewer: '@tagspaces/media-player',
+ viewer: '@tagspaces/extensions/media-player',
color: '#c5e4f9'
},
{
type: 'oga',
- viewer: '@tagspaces/media-player',
+ viewer: '@tagspaces/extensions/media-player',
color: '#c5e4f9'
},
{
type: 'ogg',
- viewer: '@tagspaces/media-player',
+ viewer: '@tagspaces/extensions/media-player',
color: '#c5e4f9'
},
{
type: 'ogv',
- viewer: '@tagspaces/media-player',
+ viewer: '@tagspaces/extensions/media-player',
color: '#c5e4f9'
},
{
type: 'ogx',
- viewer: '@tagspaces/media-player',
+ viewer: '@tagspaces/extensions/media-player',
color: '#c5e4f9'
},
{
type: 'opus',
- viewer: '@tagspaces/media-player',
+ viewer: '@tagspaces/extensions/media-player',
color: '#c5e4f9'
},
{
type: 'pdf',
- viewer: '@tagspaces/pdf-viewer',
+ viewer: '@tagspaces/extensions/pdf-viewer',
color: '#f5897f'
},
{
type: 'php',
- viewer: '@tagspaces/text-editor',
- editor: '@tagspaces/text-editor',
+ viewer: '@tagspaces/extensions/text-editor',
+ editor: '@tagspaces/extensions/text-editor',
color: ''
},
{
type: 'pl',
- viewer: '@tagspaces/text-editor',
- editor: '@tagspaces/text-editor',
+ viewer: '@tagspaces/extensions/text-editor',
+ editor: '@tagspaces/extensions/text-editor',
color: ''
},
{
type: 'png',
- viewer: '@tagspaces/image-viewer',
+ viewer: '@tagspaces/extensions/image-viewer',
color: '#9fd5ba'
},
{
type: 'psd',
- viewer: '@tagspaces/image-viewer'
+ viewer: '@tagspaces/extensions/image-viewer'
},
{
type: 'py',
- viewer: '@tagspaces/text-editor',
- editor: '@tagspaces/text-editor',
+ viewer: '@tagspaces/extensions/text-editor',
+ editor: '@tagspaces/extensions/text-editor',
color: ''
},
{
type: 'rb',
- viewer: '@tagspaces/text-editor',
- editor: '@tagspaces/text-editor',
+ viewer: '@tagspaces/extensions/text-editor',
+ editor: '@tagspaces/extensions/text-editor',
color: ''
},
{
type: 'rtf',
- viewer: '@tagspaces/rtf-viewer',
+ viewer: '@tagspaces/extensions/rtf-viewer',
color: ''
},
{
type: 'sh',
- viewer: '@tagspaces/text-editor',
- editor: '@tagspaces/text-editor',
+ viewer: '@tagspaces/extensions/text-editor',
+ editor: '@tagspaces/extensions/text-editor',
color: ''
},
{
type: 'spx',
- viewer: '@tagspaces/media-player',
+ viewer: '@tagspaces/extensions/media-player',
color: '#c5e4f9'
},
{
type: 'sql',
- viewer: '@tagspaces/text-editor',
- editor: '@tagspaces/text-editor',
+ viewer: '@tagspaces/extensions/text-editor',
+ editor: '@tagspaces/extensions/text-editor',
color: ''
},
{
type: 'svg',
- viewer: '@tagspaces/image-viewer',
- editor: '@tagspaces/text-editor',
+ viewer: '@tagspaces/extensions/image-viewer',
+ editor: '@tagspaces/extensions/text-editor',
color: '#9fd5ba'
},
{
type: 'tif',
- viewer: '@tagspaces/image-viewer'
+ viewer: '@tagspaces/extensions/image-viewer'
},
{
type: 'tiff',
- viewer: '@tagspaces/image-viewer'
+ viewer: '@tagspaces/extensions/image-viewer'
},
{
type: 'txt',
- viewer: '@tagspaces/text-editor',
- editor: '@tagspaces/text-editor'
+ viewer: '@tagspaces/extensions/text-editor',
+ editor: '@tagspaces/extensions/text-editor'
},
{
type: 'url',
- viewer: '@tagspaces/url-viewer',
+ viewer: '@tagspaces/extensions/url-viewer',
color: ''
},
{
type: 'wav',
- viewer: '@tagspaces/media-player',
+ viewer: '@tagspaces/extensions/media-player',
color: '#c5e4f9'
},
{
type: 'wave',
- viewer: '@tagspaces/media-player',
+ viewer: '@tagspaces/extensions/media-player',
color: '#c5e4f9'
},
{
type: 'webm',
- viewer: '@tagspaces/media-player',
+ viewer: '@tagspaces/extensions/media-player',
color: '#c5e4f9'
},
{
type: 'webp',
- viewer: '@tagspaces/image-viewer',
+ viewer: '@tagspaces/extensions/image-viewer',
color: '#9fd5ba'
},
{
type: 'website',
- viewer: '@tagspaces/url-viewer',
+ viewer: '@tagspaces/extensions/url-viewer',
color: ''
},
{
type: 'xhtml',
- viewer: '@tagspaces/html-viewer',
- editor: '@tagspaces/text-editor',
+ viewer: '@tagspaces/extensions/html-viewer',
+ editor: '@tagspaces/extensions/text-editor',
color: ''
},
{
type: 'xml',
- viewer: '@tagspaces/text-editor',
- editor: '@tagspaces/text-editor',
+ viewer: '@tagspaces/extensions/text-editor',
+ editor: '@tagspaces/extensions/text-editor',
color: ''
},
{
type: 'zip',
- viewer: '@tagspaces/archive-viewer',
+ viewer: '@tagspaces/extensions/archive-viewer',
color: '#ffe766'
},
{
type: 'docx',
- viewer: '@tagspaces/document-viewer',
+ viewer: '@tagspaces/extensions/document-viewer',
color: '#2196f3'
},
{
type: 'xlsx',
- viewer: '@tagspaces/spreadsheet-viewer',
+ viewer: '@tagspaces/extensions/spreadsheet-viewer',
color: '#b2f30e'
},
{
type: 'xls',
- viewer: '@tagspaces/spreadsheet-viewer',
+ viewer: '@tagspaces/extensions/spreadsheet-viewer',
color: '#b2f30e'
},
{
type: 'csv',
- viewer: '@tagspaces/spreadsheet-viewer',
+ viewer: '@tagspaces/extensions/spreadsheet-viewer',
color: '#b2f30e'
},
{
type: 'ods',
- viewer: '@tagspaces/spreadsheet-viewer',
+ viewer: '@tagspaces/extensions/spreadsheet-viewer',
color: '#b2f30e'
}
],
diff --git a/app/reducers/settings.ts b/app/reducers/settings.ts
index d0ac8df78..fbf459ac2 100644
--- a/app/reducers/settings.ts
+++ b/app/reducers/settings.ts
@@ -79,24 +79,41 @@ export const types = {
export default (state: any = defaultSettings, action: any) => {
switch (action.type) {
case types.UPGRADE_SETTINGS: {
+ // const currentVersion = semver.coerce(versionMeta.version);
+ // console.log('---->' + currentVersion);
+
const mergedKeyBindings = defaultSettings.keyBindings.map(x =>
Object.assign(
x,
state.keyBindings.find(y => y.name === x.name)
)
);
- const mergedFileTypes = defaultSettings.supportedFileTypes.map(x =>
- Object.assign(
- x,
- state.supportedFileTypes.find(y => y.type === x.type)
- )
- );
- const combinedFileTypes = state.supportedFileTypes.map(x =>
- Object.assign(
- x,
- mergedFileTypes.find(y => y.type === x.type)
- )
+ // Bidirectional filetype merge
+ // const mergedFileTypes = defaultSettings.supportedFileTypes.map(x =>
+ // Object.assign(
+ // x,
+ // state.supportedFileTypes.find(y => y.type === x.type)
+ // )
+ // );
+ // const combinedFileTypes = state.supportedFileTypes.map(x =>
+ // Object.assign(
+ // x,
+ // mergedFileTypes.find(y => y.type === x.type)
+ // )
+ // );
+ const extensionMigrated = state.supportedFileTypes.find(y =>
+ y.viewer.startsWith('@tagspaces/extensions/')
);
+ let migratedFileTypes = [];
+ if (!extensionMigrated) {
+ migratedFileTypes = state.supportedFileTypes.map(x =>
+ Object.assign(
+ x,
+ defaultSettings.supportedFileTypes.find(y => y.type === x.type)
+ )
+ );
+ console.log('Performing filetype migration');
+ }
return {
...defaultSettings,
...state,
@@ -107,10 +124,10 @@ export default (state: any = defaultSettings, action: any) => {
// ...defaultSettings.keyBindings, // use to reset to the default key bindings
...mergedKeyBindings
],
- supportedFileTypes: [
- // ...defaultSettings.supportedFileTypes, // use to reset to the default file types
- ...combinedFileTypes
- ]
+ supportedFileTypes:
+ migratedFileTypes.length > 0
+ ? [...migratedFileTypes]
+ : state.supportedFileTypes
};
}
case types.TOGGLE_SHOWUNIXHIDDENENTRIES: {
@@ -640,9 +657,9 @@ export const getKeyBindings = (state: any) => state.settings.keyBindings;
export const getKeyBindingObject = (state: any) =>
generateKeyBindingObject(state.settings.keyBindings);
export const getSupportedFileTypes = (state: any) =>
- state.settings.supportedFileTypes;
-/* export const getPerspectives = (state: any) =>
- state.settings.supportedPerspectives; */
+ state.settings.supportedFileTypes.sort((a, b) => {
+ return a.type > b.type ? 1 : a.type < b.type ? -1 : 0;
+ });
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/app/services/utils-io.ts b/app/services/utils-io.ts
index 52b125de4..28a31e0fb 100644
--- a/app/services/utils-io.ts
+++ b/app/services/utils-io.ts
@@ -282,7 +282,7 @@ export function findExtensionsForEntry(
PlatformIO.getDirSeparator()
).toLowerCase();
const viewingExtensionPath = isFile
- ? findExtensionPathForId('@tagspaces/text-viewer')
+ ? findExtensionPathForId('@tagspaces/extensions/text-viewer')
: 'about:blank';
const fileForOpening: OpenedEntry = {
path: entryPath,
diff --git a/scripts/setupextensions.js b/scripts/setupextensions.js
index e8290bd8c..2934dbdeb 100644
--- a/scripts/setupextensions.js
+++ b/scripts/setupextensions.js
@@ -15,95 +15,95 @@ const extensionDir = 'extensions';
const extensionBranch = 'master';
const extensionList = [
- {
- package: '@tagspaces/spreadsheet-viewer',
- path: 'viewerSpreadSheet',
- url: 'https://github.com/tagspaces/viewerSpreadSheet'
- },
- {
- package: '@tagspaces/document-viewer',
- path: 'viewerDocument',
- url: 'https://github.com/tagspaces/viewerDocument'
- },
- {
- package: '@tagspaces/pdf-viewer',
- path: 'viewerPDF',
- url: 'https://github.com/tagspaces/viewerPDF'
- },
- {
- package: '@tagspaces/image-viewer',
- path: 'viewerImage',
- url: 'https://github.com/tagspaces/viewerImage'
- },
- {
- package: '@tagspaces/html-viewer',
- path: 'viewerHTML',
- url: 'https://github.com/tagspaces/viewerHTML'
- },
- {
- package: '@tagspaces/md-viewer',
- path: 'viewerMD',
- url: 'https://github.com/tagspaces/viewerMD'
- },
- {
- package: '@tagspaces/url-viewer',
- path: 'viewerURL',
- url: 'https://github.com/tagspaces/viewerURL'
- },
- {
- package: '@tagspaces/media-player',
- path: 'viewerAudioVideo',
- url: 'https://github.com/tagspaces/viewerAudioVideo'
- },
- {
- package: '@tagspaces/plain-viewer',
- path: 'viewerBrowser',
- url: 'https://github.com/tagspaces/viewerBrowser'
- },
- {
- package: '@tagspaces/mhtml-viewer',
- path: 'viewerMHTML',
- url: 'https://github.com/tagspaces/viewerMHTML'
- },
- {
- package: '@tagspaces/rtf-viewer',
- path: 'viewerRTF',
- url: 'https://github.com/tagspaces/viewerRTF'
- },
- {
- package: '@tagspaces/text-viewer',
- path: 'viewerText',
- url: 'https://github.com/tagspaces/viewerText'
- },
- {
- package: '@tagspaces/archive-viewer',
- path: 'viewerZIP',
- url: 'https://github.com/tagspaces/viewerZIP'
- },
- {
- package: '@tagspaces/ebook-viewer',
- path: 'viewerEPUB',
- url: 'https://github.com/tagspaces/viewerEPUB'
- },
- {
- package: '@tagspaces/text-editor',
- path: 'editorText',
- url: 'https://github.com/tagspaces/editorText'
- },
- {
- package: '@tagspaces/json-editor',
- path: 'editorJSON',
- url: 'https://github.com/tagspaces/editorJSON'
- },
- {
- package: '@tagspaces/html-editor',
- path: 'editorHTML',
- url: 'https://github.com/tagspaces/editorHTML'
- },
- {
- package: '@tagspaces/legacy-ext',
- path: 'extCommons',
- url: 'https://github.com/tagspaces/extCommons'
+ // {
+ // package: '@tagspaces/spreadsheet-viewer',
+ // path: 'viewerSpreadSheet',
+ // url: 'https://github.com/tagspaces/viewerSpreadSheet'
+ // },
+ // {
+ // package: '@tagspaces/document-viewer',
+ // path: 'viewerDocument',
+ // url: 'https://github.com/tagspaces/viewerDocument'
+ // },
+ // {
+ // package: '@tagspaces/pdf-viewer',
+ // path: 'viewerPDF',
+ // url: 'https://github.com/tagspaces/viewerPDF'
+ // },
+ // {
+ // package: '@tagspaces/image-viewer',
+ // path: 'viewerImage',
+ // url: 'https://github.com/tagspaces/viewerImage'
+ // },
+ // {
+ // package: '@tagspaces/html-viewer',
+ // path: 'viewerHTML',
+ // url: 'https://github.com/tagspaces/viewerHTML'
+ // },
+ // {
+ // package: '@tagspaces/md-viewer',
+ // path: 'viewerMD',
+ // url: 'https://github.com/tagspaces/viewerMD'
+ // },
+ // {
+ // package: '@tagspaces/url-viewer',
+ // path: 'viewerURL',
+ // url: 'https://github.com/tagspaces/viewerURL'
+ // },
+ // {
+ // package: '@tagspaces/media-player',
+ // path: 'viewerAudioVideo',
+ // url: 'https://github.com/tagspaces/viewerAudioVideo'
+ // },
+ // {
+ // package: '@tagspaces/mhtml-viewer',
+ // path: 'viewerMHTML',
+ // url: 'https://github.com/tagspaces/viewerMHTML'
+ // },
+ // {
+ // package: '@tagspaces/rtf-viewer',
+ // path: 'viewerRTF',
+ // url: 'https://github.com/tagspaces/viewerRTF'
+ // },
+ // {
+ // package: '@tagspaces/text-viewer',
+ // path: 'viewerText',
+ // url: 'https://github.com/tagspaces/viewerText'
+ // },
+ // {
+ // package: '@tagspaces/archive-viewer',
+ // path: 'viewerZIP',
+ // url: 'https://github.com/tagspaces/viewerZIP'
+ // },
+ // {
+ // package: '@tagspaces/ebook-viewer',
+ // path: 'viewerEPUB',
+ // url: 'https://github.com/tagspaces/viewerEPUB'
+ // },
+ // {
+ // package: '@tagspaces/text-editor',
+ // path: 'editorText',
+ // url: 'https://github.com/tagspaces/editorText'
+ // },
+ // {
+ // package: '@tagspaces/json-editor',
+ // path: 'editorJSON',
+ // url: 'https://github.com/tagspaces/editorJSON'
+ // },
+ // {
+ // package: '@tagspaces/html-editor',
+ // path: 'editorHTML',
+ // url: 'https://github.com/tagspaces/editorHTML'
+ // },
+ // {
+ // package: '@tagspaces/legacy-ext',
+ // path: 'extCommons',
+ // url: 'https://github.com/tagspaces/extCommons'
+ // },
+ {
+ package: '@tagspaces/extensions',
+ path: 'extensions',
+ url: 'https://github.com/tagspaces/tagspaces-extensions'
}
];