self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-11-29 22:48:10 +02:00
Code Issues Releases Activity

Revert "Desktop: Add ENEX to HTML export (#1795)"

Browse Source 
This reverts commit 2f14832c34.

Reverting PR #1795 due to broken MD import and other issues
This commit is contained in:
Laurent Cozic
2019-09-20 22:18:09 +01:00
parent c7c57ab2a5
commit 50b66cceca
24 changed files with 678 additions and 1265 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
ReactNativeClient/lib/services/InteropService.js
View File

@@ -13,7 +13,8 @@ const { toTitleCase } = require('lib/string-utils');
class InteropService {
constructor() {
this.modules_ = null; }
this.modules_ = null;
}
modules() {
if (this.modules_) return this.modules_;
@@ -41,16 +42,7 @@ class InteropService {
format: 'enex',
fileExtensions: ['enex'],
sources: ['file'],
description: _('Evernote Export File (as Markdown)'),
importerClass: 'InteropService_Importer_EnexToMd',
},
{
format: 'enex',
fileExtensions: ['enex'],
sources: ['file'],
description: _('Evernote Export File (as HTML)'),
// TODO: Consider doing this the same way as the multiple `md` importers are handled
importerClass: 'InteropService_Importer_EnexToHtml',
description: _('Evernote Export File'),
},
];
@@ -120,9 +112,8 @@ class InteropService {
return this.modules_;
}
findModuleByFormat_(type, format) {
moduleByFormat_(type, format) {
const modules = this.modules();
// console.log(JSON.stringify({modules}, null, 2))
for (let i = 0; i < modules.length; i++) {
const m = modules[i];
if (m.format === format && m.type === type) return modules[i];
@@ -130,8 +121,8 @@ class InteropService {
return null;
}
newModuleByFormat_(type, format) {
const module = this.findModuleByFormat_(type, format);
newModule_(type, format) {
const module = this.moduleByFormat_(type, format);
if (!module) throw new Error(_('Cannot load "%s" module for format "%s"', type, format));
const ModuleClass = require(module.path);
const output = new ModuleClass();
@@ -139,26 +130,6 @@ class InteropService {
return output;
}
/**
* The existing `newModuleByFormat_` fn would load by the input format. This
* was fine when there was a 1-1 mapping of input formats to output formats,
* but now that we have 2 possible outputs for an `enex` input, we need to be
* explicit with which importer we want to use.
*
* In the long run, it might make sense to simply move all the existing
* formatters to the `newModuleFromPath_` approach, so that there's only one
* way to do this mapping.
*
* https://github.com/laurent22/joplin/pull/1795#pullrequestreview-281574417
*/
newModuleFromPath_(options) {
if (!options || !options.modulePath) throw new Error('Cannot load module without a defined path to load from.');
const ModuleClass = require(options.modulePath);
const output = new ModuleClass();
output.setMetadata(options); // TODO: Check that this metadata is equivalent to module above
return output;
}
moduleByFileExtension_(type, ext) {
ext = ext.toLowerCase();
@@ -202,10 +173,7 @@ class InteropService {
let result = { warnings: [] };
// console.log('options passed to InteropService:');
// console.log(JSON.stringify({options}, null, 2));
const importer = this.newModuleFromPath_(options);
const importer = this.newModule_('importer', options.format);
await importer.init(options.path, options);
result = await importer.exec(result);
@@ -280,7 +248,7 @@ class InteropService {
await queueExportItem(BaseModel.TYPE_TAG, exportedTagIds[i]);
}
const exporter = this.newModuleByFormat_('exporter', exportFormat);
const exporter = this.newModule_('exporter', exportFormat);
await exporter.init(exportPath);
const typeOrder = [BaseModel.TYPE_FOLDER, BaseModel.TYPE_RESOURCE, BaseModel.TYPE_NOTE, BaseModel.TYPE_TAG, BaseModel.TYPE_NOTE_TAG];