fix: handling enex filenames containing multiple dots (#456)

akosbalasko · Feb 28, 2023 · 61a4275 · 61a4275
1 parent cac0bb5
commit 61a4275
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 1 deletion.
diff --git a/src/utils/folder-utils.ts b/src/utils/folder-utils.ts
@@ -90,7 +90,7 @@ export const setPaths = (enexSource: string): void => {
   // loggerInfo('setting paths');
   const enexFolder = enexSource.split(path.sep);
   // loggerInfo(`enex folder split: ${JSON.stringify(enexFolder)}`);
-  const enexFile = (enexFolder.length >= 1 ?  enexFolder[enexFolder.length - 1] : enexFolder[0]).split('.')[0];
+  const enexFile = (enexFolder.length >= 1 ?  enexFolder[enexFolder.length - 1] : enexFolder[0]).split(/.enex$/)[0];
   // loggerInfo(`enex file: ${enexFile}`);
 
   const outputDir = path.isAbsolute(yarleOptions.outputDir)

diff --git a/test/data/test.dots.in.enex.File.Name.enex b/test/data/test.dots.in.enex.File.Name.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="20181006T112423Z" application="Evernote" version="Evernote Mac 7.5 (457109)">
+<note><title>test.dots.in.enex.File.Name</title><content><![CDATA[<!DOCTYPE en-note SYSTEM "http://xml.evernote.com/pub/enml2.dtd"><en-note><div>This is the content</div></en-note>]]></content><created>20181006T084349Z</created><updated>20181006T084411Z</updated><tag>tag1</tag><tag>tag2</tag><note-attributes><author>akos</author><source>desktop.mac</source><reminder-order>0</reminder-order></note-attributes></note>
+</en-export>
diff --git a/test/data/test.dots.in.enex.File.Name.md b/test/data/test.dots.in.enex.File.Name.md
@@ -0,0 +1,14 @@
+# test.dots.in.enex.File.Name
+
+
+---
+Tags: ["tag1","tag2"]
+
+---
+
+
+This is the content
+
+    Created at: 2018-10-06T09:43:49+01:00
+    Updated at: 2018-10-06T09:44:11+01:00
+      Notebook: test.dots.in.enex.File.Name
diff --git a/test/yarle-special-cases.spec.ts b/test/yarle-special-cases.spec.ts
@@ -1088,4 +1088,36 @@ dateFormat: undefined,
       fs.readFileSync(`${__dirname}/data/test -note with tags array.md`, 'utf8'),
     );
   });
+
+
+
+  it('dots in enex file name', async () => {
+    const options: YarleOptions = {
+      dateFormat: undefined,
+      enexSources: [ `${testDataFolder}test.dots.in.enex.File.Name.enex` ],
+      outputDir: 'out',
+      templateFile: `${testDataFolder}tags-array_template.templ`,
+      isMetadataNeeded: true,
+      outputFormat: OutputFormat.ObsidianMD,
+      skipEnexFileNameFromOutputPath: false,
+			skipTags: false,
+			useHashTags: false,
+
+    };
+    await yarle.dropTheRope(options);
+    assert.equal(
+      fs.existsSync(
+        `${__dirname}/../out/notes/test.dots.in.enex.File.Name/test.dots.in.enex.File.Name.md`,
+      ),
+      true,
+    );
+    assert.equal(
+      eol.auto(fs.readFileSync(
+        `${__dirname}/../out/notes/test.dots.in.enex.File.Name/test.dots.in.enex.File.Name.md`,
+        'utf8',
+      )),
+      fs.readFileSync(`${__dirname}/data/test.dots.in.enex.File.Name.md`, 'utf8'),
+    );
+  });
+
 });