fix: bug53, code cleaned

README.md

@@ -63,6 +63,11 @@ Those markdown notes that contains external resources such pictures or files, ar
 
 ## Release notes
 
+### Version 2.9.2 
+
+- [Issue#49](https://github.com/akosbalasko/yarle/issues/49) fixed
+- [Issue#53](https://github.com/akosbalasko/yarle/issues/53) fixed
+
 ### Version 2.9.1
 
 - Enclosing brackets around links are removed to avoid causing troubles in MD file (fixes: [Issue#50](https://github.com/akosbalasko/yarle/issues/50)) 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "yarle-evernote-to-md",
-  "version": "2.9.1",
+  "version": "2.9.2",
   "description": "Yet Another Rope Ladder from Evernote",
   "keywords": [
     "evernote",

src/dropTheRope.ts

@@ -1,4 +1,6 @@
 /* istanbul ignore file */
+// tslint:disable:no-console
+
 import * as minimist from 'minimist';
 import * as fs from 'fs';
 
@@ -42,3 +44,4 @@ export const run = async () => {
     process.exit();
 };
 run();
+// tslint:enable:no-console

src/utils/turndown-rules/span.ts

@@ -18,5 +18,7 @@ export const spanRule = {
                 `${HIGHLIGHT_SEPARATOR}${content}${HIGHLIGHT_SEPARATOR}` :
                 content;
         }
+
+        return content;
     },
 };

src/utils/turndown-service.ts

@@ -26,6 +26,6 @@ export const getTurndownService = () => {
     turndownService.addRule('images', imagesRule);
     turndownService.addRule('span', spanRule);
     turndownService.use(gfm);
-    
+
     return turndownService;
 };

src/yarle.ts

@@ -1,3 +1,4 @@
+// tslint:disable:no-console
 import * as fs from 'fs';
 import * as parser from 'fast-xml-parser';
 import * as XmlStream from 'xml-stream';
@@ -49,7 +50,7 @@ export const parseStream = async (options: YarleOptions): Promise<void> => {
       console.log(
         `Conversion finished: ${success} succeeded, ${
           totalNotes - success
-        } failed.`
+        } failed.`,
       );
 
       return resolve();
@@ -63,7 +64,7 @@ export const parseStream = async (options: YarleOptions): Promise<void> => {
       let np = new NodeProcessor();
       np.processNode(item);
       np = undefined;
-      
+
      console.log('note');
     });*/
   });
@@ -72,23 +73,8 @@ export const parseStream = async (options: YarleOptions): Promise<void> => {
 export const dropTheRope = async (options: YarleOptions): Promise<void> => {
   setOptions(options);
   utils.setPaths();
-  /* const content = fs.readFileSync(options.enexFile, 'utf8');
-  const notebook = parser.parse(content, xmlParserOptions);
-  const notes = notebook['en-export'];*/
+
   return parseStream(options);
-  /*
-    const notes = notebook['en-export'];
-    // utils.clearResourceDistDir();
-  
-    if (notes) {
-      if (Array.isArray(notes['note'])) {
-        for (const [index, note] of notes['note'].entries()) {
-          if (!(yarleOptions.plainTextNotesOnly && note.resource)) {
-            processNode(note);
-          }
-        }
-      } else if (!(yarleOptions.plainTextNotesOnly && notes['note'] as any).resource) {
-          processNode(notes['note']);
-      }
-    }*/
+
 };
+// tslint:enable:no-console

test/data/test-nospanstyle.enex

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE en-export SYSTEM "http://xml.evernote.com/pub/evernote-export3.dtd">
+<en-export export-date="20200924T144847Z" application="Evernote" version="Evernote Mac 7.14 (458244)">
+<note><title>test-nospanstyle</title><content><![CDATA[<!DOCTYPE en-note SYSTEM "http://xml.evernote.com/pub/enml2.dtd"><en-note><div><span>N3<span>    ni ____</span></span></div><div><span><span>N5<span>    inin ____</span></span></span></div><div><span><span><span>N21<span>   īnī ____</span></span></span></span></div></en-note>]]></content><created>20200707T002138Z</created><updated>20200906T212153Z</updated><note-attributes><source>desktop.mac</source><reminder-order>0</reminder-order></note-attributes></note>
+</en-export>

test/data/test-nospanstyle.md

@@ -0,0 +1,9 @@
+# test-nospanstyle
+N3 ni \_\_\_\_
+N5 inin \_\_\_\_
+N21 īnī \_\_\_\_
+
+    Created at: 2020-07-07T01:21:38+01:00
+    Updated at: 2020-09-06T22:21:53+01:00
+
+

test/yarle.spec.ts

@@ -77,7 +77,7 @@ describe('dropTheRope ', async () => {
       fs.readFileSync(`${__dirname}/data/test-bracketlinks.md`, 'utf8'),
     );
   });
-  
+
   it('Enex file with note containing text only', async () => {
     const options: YarleOptions = {
       enexFile: './test/data/test-justText.enex',
@@ -693,4 +693,30 @@ describe('dropTheRope ', async () => {
       fs.readFileSync(`${__dirname}/data/test-twoNotes-text.md`, 'utf8'),
     );
   });
+
+  it('Enex file - no span style', async () => {
+    const options: YarleOptions = {
+      enexFile: './test/data/test-nospanstyle.enex',
+      outputDir: 'out',
+      isMetadataNeeded: true,
+      plainTextNotesOnly: false,
+      outputFormat: OutputFormat.ObsidianMD,
+    };
+    await yarle.dropTheRope(options);
+    assert.equal(
+      fs.existsSync(
+        `${__dirname}/../out/simpleNotes/test-nospanstyle/test-nospanstyle.md`,
+      ),
+      true,
+    );
+
+    assert.equal(
+      fs.readFileSync(
+        `${__dirname}/../out/simpleNotes/test-nospanstyle/test-nospanstyle.md`,
+        'utf8',
+      ),
+      fs.readFileSync(`${__dirname}/data/test-nospanstyle.md`, 'utf8'),
+    );
+  });
+
 });