fix: filename with multiple dots (#597)

akosbalasko · Feb 17, 2024 · 119beab · 119beab
1 parent 3ec7ce2
commit 119beab
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 8 deletions.
diff --git a/src/utils/filename-utils.ts b/src/utils/filename-utils.ts
@@ -65,7 +65,10 @@ export const getResourceFileProperties = (workDir: string, resource: any): Resou
 
   if (resource['resource-attributes'] && resource['resource-attributes']['file-name']) {
     const fileNamePrefix = resource['resource-attributes']['file-name'].substr(0, 50);
-    fileName = fileNamePrefix.split('.')[0];
+    const lastIdx = fileNamePrefix.lastIndexOf('.');
+		fileName = lastIdx !== -1
+			? fileNamePrefix.slice(0, lastIdx)
+			: fileNamePrefix;fileNamePrefix.includes('.') ? fileNamePrefix.split('.').slice(0, -1).join('.') : fileNamePrefix;
   }
   fileName = applyCharacterMapSafely(fileName);
   extension = applyCharacterMapSafely(extension);

diff --git a/test/data/simple_file.dot.dat b/test/data/simple_file.dot.dat
diff --git a/test/data/test-link-with-images-no-size.md b/test/data/test-link-with-images-no-size.md
@@ -265,7 +265,7 @@ Labels: [Baking](https://notsohumblepie.blogspot.com/search/label/Baking), [Cara
 
 	[[#|Reply]]
 
-25. ![[./_resources/Not_So_Humble_Pie__White_Chocolate_Caramel_Cheesec.resources/Bilde-2Btatt-2B29.jpg]]
+25. ![[./_resources/Not_So_Humble_Pie__White_Chocolate_Caramel_Cheesec.resources/Bilde-2Btatt-2B29.09.2010-2Bkl.-2B17.37-2B-233.jpg]]
 
 	[K.M.](https://www.blogger.com/profile/12467809348618421676)[April 15, 2010 at 12:52 PM](https://notsohumblepie.blogspot.com/2010/04/white-chocolate-caramel-cheesecake.html?showComment=1271361173923#c5274477479388401616)
 
@@ -290,7 +290,7 @@ Labels: [Baking](https://notsohumblepie.blogspot.com/search/label/Baking), [Cara
 
 	[[#|Reply]]
 
-28. ![[./_resources/Not_So_Humble_Pie__White_Chocolate_Caramel_Cheesec.resources/crackcookies.jpg]]
+28. ![[./_resources/Not_So_Humble_Pie__White_Chocolate_Caramel_Cheesec.resources/crackcookies.hand.jpg]]
 
 	[The Urban Baker](https://www.blogger.com/profile/02561212652465463688)[April 19, 2010 at 4:09 PM](https://notsohumblepie.blogspot.com/2010/04/white-chocolate-caramel-cheesecake.html?showComment=1271718572567#c193393323174013606)
 

diff --git a/test/data/test-link-with-images.md b/test/data/test-link-with-images.md
@@ -265,7 +265,7 @@ Labels: [Baking](https://notsohumblepie.blogspot.com/search/label/Baking), [Cara
 
 	[[#|Reply]]
 
-25. ![[./_resources/Not_So_Humble_Pie__White_Chocolate_Caramel_Cheesec.resources/Bilde-2Btatt-2B29.jpg\|36x36]]
+25. ![[./_resources/Not_So_Humble_Pie__White_Chocolate_Caramel_Cheesec.resources/Bilde-2Btatt-2B29.09.2010-2Bkl.-2B17.37-2B-233.jpg\|36x36]]
 
 	[K.M.](https://www.blogger.com/profile/12467809348618421676)[April 15, 2010 at 12:52 PM](https://notsohumblepie.blogspot.com/2010/04/white-chocolate-caramel-cheesecake.html?showComment=1271361173923#c5274477479388401616)
 
@@ -290,7 +290,7 @@ Labels: [Baking](https://notsohumblepie.blogspot.com/search/label/Baking), [Cara
 
 	[[#|Reply]]
 
-28. ![[./_resources/Not_So_Humble_Pie__White_Chocolate_Caramel_Cheesec.resources/crackcookies.jpg\|36x36]]
+28. ![[./_resources/Not_So_Humble_Pie__White_Chocolate_Caramel_Cheesec.resources/crackcookies.hand.jpg\|36x36]]
 
 	[The Urban Baker](https://www.blogger.com/profile/02561212652465463688)[April 19, 2010 at 4:09 PM](https://notsohumblepie.blogspot.com/2010/04/white-chocolate-caramel-cheesecake.html?showComment=1271718572567#c193393323174013606)
 

diff --git a/test/utils.spec.ts b/test/utils.spec.ts
@@ -162,11 +162,21 @@ describe('filename', () => {
         const resource = {
             mime: 'image/png',
             'resource-attributes': {
-                'file-name': 'fileName.jpg',
+                'file-name': 'fileName.dot.jpg',
+            },
+        };
+        const fileProps = utils.getResourceFileProperties('./test/data', resource);
+        assert.equal(fileProps.fileName, 'fileName.dot.jpg');
+    });
+    it('filename returned, exists, with dots, extendsion', () => {
+        const resource = {
+            mime: 'image/png',
+            'resource-attributes': {
+                'file-name': 'simple_file.dot.dat',
             },
         };
         const fileProps = utils.getResourceFileProperties('./test/data', resource);
-        assert.equal(fileProps.fileName, 'fileName.jpg');
+        assert.equal(fileProps.fileName, 'simple_file.dot.1.dat');
     });
     it('filename returned, file already exists, no extension', () => {
         const resource = {

diff --git a/test/yarle-special-cases.spec.ts b/test/yarle-special-cases.spec.ts
@@ -1382,7 +1382,7 @@ dateFormat: undefined,
     );
     assert.equal(
       fs.existsSync(
-        `${__dirname}/../out/notes/test-scriptAttachment/_resources/scriptAttachment.resources/sample.scpt`,
+        `${__dirname}/../out/notes/test-scriptAttachment/_resources/scriptAttachment.resources/sample.pdf.scpt`,
       ),
       true,
     );