`.
- */
-const compareOutputToExpected = (options) => {
- const inputFile = fileWithPath(`${options.testName}.enex`);
- const outputFile = fileWithPath(`${options.testName}.html`);
- const testTitle = `should convert from Enex to Html: ${options.testName}`;
-
- it(testTitle, asyncTest(async () => {
- const enexInput = await shim.fsDriver().readFile(inputFile);
- const expectedOutput = await shim.fsDriver().readFile(outputFile);
- const actualOutput = await enexXmlToHtml(enexInput, options.resources);
-
- expect(actualOutput).toEqual(expectedOutput);
- }));
-};
-
-describe('EnexToHtml', function() {
- beforeEach(async (done) => {
- await setupDatabaseAndSynchronizer(1);
- await switchClient(1);
- done();
- });
-
- compareOutputToExpected({
- testName: 'checklist-list',
- resources: [],
- });
-
- compareOutputToExpected({
- testName: 'svg',
- resources: [],
- });
-
- compareOutputToExpected({
- testName: 'en-media--image',
- resources: [{
- filename: '',
- id: '89ce7da62c6b2832929a6964237e98e9', // Mock id
- mime: 'image/jpeg',
- size: 50347,
- title: '',
- }],
- });
-
- compareOutputToExpected({
- testName: 'en-media--audio',
- resources: [audioResource],
- });
-
- compareOutputToExpected({
- testName: 'attachment',
- resources: [{
- filename: 'attachment-1',
- id: '21ca2b948f222a38802940ec7e2e5de3',
- mime: 'application/pdf', // Any non-image/non-audio mime type will do
- size: 1000,
- }],
- });
-
- it('fails when not given a matching resource', asyncTest(async () => {
- // To test the promise-unexpectedly-resolved case, add `audioResource` to the array.
- const resources = [];
- const inputFile = fileWithPath('en-media--image.enex');
- const enexInput = await shim.fsDriver().readFile(inputFile);
- const promisedOutput = enexXmlToHtml(enexInput, resources);
-
- promisedOutput.then(() => {
- // Promise should not be resolved
- expect(false).toEqual(true);
- }, (reason) => {
- expect(reason)
- .toBe('Hash with no associated resource: 89ce7da62c6b2832929a6964237e98e9');
- });
- }));
-
-});
diff --git a/CliClient/tests/enex_to_html/attachment.enex b/CliClient/tests/enex_to_html/attachment.enex
deleted file mode 100644
index cf66a3f07..000000000
--- a/CliClient/tests/enex_to_html/attachment.enex
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/CliClient/tests/enex_to_html/attachment.html b/CliClient/tests/enex_to_html/attachment.html
deleted file mode 100644
index c32fb1310..000000000
--- a/CliClient/tests/enex_to_html/attachment.html
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/CliClient/tests/enex_to_html/checklist-list.enex b/CliClient/tests/enex_to_html/checklist-list.enex
deleted file mode 100644
index 2552fe504..000000000
--- a/CliClient/tests/enex_to_html/checklist-list.enex
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
For example, consider an exported Evernote list with todo checkboxes like this:
-
-
-
-
For example, consider an exported Evernote list with todo checkboxes like this:
-
-
diff --git a/CliClient/tests/enex_to_html/en-media--audio.html b/CliClient/tests/enex_to_html/en-media--audio.html
deleted file mode 100644
index c71c6cf7a..000000000
--- a/CliClient/tests/enex_to_html/en-media--audio.html
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
audio test
-
-
-
-
-
\ No newline at end of file
diff --git a/CliClient/tests/enex_to_html/en-media--image.enex b/CliClient/tests/enex_to_html/en-media--image.enex
deleted file mode 100644
index 92a477426..000000000
--- a/CliClient/tests/enex_to_html/en-media--image.enex
+++ /dev/null
@@ -1 +0,0 @@
-This is a test
A test for bold
A test for italic
diff --git a/CliClient/tests/enex_to_html/en-media--image.html b/CliClient/tests/enex_to_html/en-media--image.html
deleted file mode 100644
index f3c09555e..000000000
--- a/CliClient/tests/enex_to_html/en-media--image.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
- This is a test
- A test for bold
-
- A test for italic
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/CliClient/tests/enex_to_html/svg.enex b/CliClient/tests/enex_to_html/svg.enex
deleted file mode 100644
index 33cfb89ec..000000000
--- a/CliClient/tests/enex_to_html/svg.enex
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
`;
-
-const audioElement = ({src, alt, id}) =>
- [
- '',
- '',
- ` `,
- ` ${alt || src || id || 'Download audio'}`,
- ' ',
- '
',
- ].join('');
-
-const resourceUtils = {
- imgElement,
- audioElement,
- attachmentElement,
- attributesToStr,
- isImageMimeType: (m) => imageMimeTypes.indexOf(m) >= 0,
-};
-
-module.exports = resourceUtils;
diff --git a/ReactNativeClient/lib/services/InteropService.js b/ReactNativeClient/lib/services/InteropService.js
index 1d9d6076a..98b4b8163 100644
--- a/ReactNativeClient/lib/services/InteropService.js
+++ b/ReactNativeClient/lib/services/InteropService.js
@@ -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];
diff --git a/ReactNativeClient/lib/services/InteropService_Importer_EnexToMd.js b/ReactNativeClient/lib/services/InteropService_Importer_Enex.js
similarity index 81%
rename from ReactNativeClient/lib/services/InteropService_Importer_EnexToMd.js
rename to ReactNativeClient/lib/services/InteropService_Importer_Enex.js
index c3ebb8694..ad97fa67c 100644
--- a/ReactNativeClient/lib/services/InteropService_Importer_EnexToMd.js
+++ b/ReactNativeClient/lib/services/InteropService_Importer_Enex.js
@@ -2,7 +2,7 @@ const InteropService_Importer_Base = require('lib/services/InteropService_Import
const Folder = require('lib/models/Folder.js');
const { filename } = require('lib/path-utils.js');
-class InteropService_Importer_EnexToMd extends InteropService_Importer_Base {
+class InteropService_Importer_Enex extends InteropService_Importer_Base {
async exec(result) {
const { importEnex } = require('lib/import-enex');
@@ -19,4 +19,4 @@ class InteropService_Importer_EnexToMd extends InteropService_Importer_Base {
}
}
-module.exports = InteropService_Importer_EnexToMd;
+module.exports = InteropService_Importer_Enex;
diff --git a/ReactNativeClient/lib/services/InteropService_Importer_EnexToHtml.js b/ReactNativeClient/lib/services/InteropService_Importer_EnexToHtml.js
deleted file mode 100644
index a58dd002c..000000000
--- a/ReactNativeClient/lib/services/InteropService_Importer_EnexToHtml.js
+++ /dev/null
@@ -1,22 +0,0 @@
-const InteropService_Importer_Base = require('lib/services/InteropService_Importer_Base');
-const Folder = require('lib/models/Folder.js');
-const { filename } = require('lib/path-utils.js');
-
-class InteropService_Importer_EnexToHtml extends InteropService_Importer_Base {
- async exec(result) {
- const { importEnex } = require('lib/import-enex');
-
- let folder = this.options_.destinationFolder;
-
- if (!folder) {
- const folderTitle = await Folder.findUniqueItemTitle(filename(this.sourcePath_));
- folder = await Folder.save({ title: folderTitle });
- }
-
- await importEnex(folder.id, this.sourcePath_, {...this.options_, outputFormat: 'html'});
-
- return result;
- }
-}
-
-module.exports = InteropService_Importer_EnexToHtml;