diff --git a/browser/main/lib/dataApi/attachmentManagement.js b/browser/main/lib/dataApi/attachmentManagement.js
index 6a0315f7..fb3beac1 100644
--- a/browser/main/lib/dataApi/attachmentManagement.js
+++ b/browser/main/lib/dataApi/attachmentManagement.js
@@ -227,15 +227,7 @@ function migrateAttachments (markdownContent, storagePath, noteKey) {
* @returns {String} postprocessed HTML in which all :storage references are mapped to the actual paths.
*/
function fixLocalURLS (renderedHTML, storagePath) {
- /*
- A :storage reference is like `:storage/3b6f8bd6-4edd-4b15-96e0-eadc4475b564/f939b2c3.jpg`.
-
- - `STORAGE_FOLDER_PLACEHOLDER` will match `:storage`
- - `(?:(?:\\\/|%5C)[\\w.]+)+` will match `/3b6f8bd6-4edd-4b15-96e0-eadc4475b564/f939b2c3.jpg`
- - `(?:\\\/|%5C)[\\w.]+` will either match `/3b6f8bd6-4edd-4b15-96e0-eadc4475b564` or `/f939b2c3.jpg`
- - `(?:\\\/|%5C)` match the path seperator. `\\\/` for posix systems and `%5C` for windows.
- */
- return renderedHTML.replace(new RegExp('/?' + STORAGE_FOLDER_PLACEHOLDER + '(?:(?:\\\/|%5C)[\\w.]+)+', 'g'), function (match) {
+ return renderedHTML.replace(new RegExp('/?' + STORAGE_FOLDER_PLACEHOLDER + '.*?"', 'g'), function (match) {
var encodedPathSeparators = new RegExp(mdurl.encode(path.win32.sep) + '|' + mdurl.encode(path.posix.sep), 'g')
return match.replace(encodedPathSeparators, path.sep).replace(new RegExp('/?' + STORAGE_FOLDER_PLACEHOLDER, 'g'), 'file:///' + path.join(storagePath, DESTINATION_FOLDER))
})
@@ -429,7 +421,14 @@ function replaceNoteKeyWithNewNoteKey (noteContent, oldNoteKey, newNoteKey) {
* @returns {String} Input without the references
*/
function removeStorageAndNoteReferences (input, noteKey) {
- return input.replace(new RegExp(mdurl.encode(path.sep), 'g'), path.sep).replace(new RegExp(STORAGE_FOLDER_PLACEHOLDER + '(' + escapeStringRegexp(path.sep) + noteKey + ')?', 'g'), DESTINATION_FOLDER)
+ return input.replace(new RegExp('/?' + STORAGE_FOLDER_PLACEHOLDER + '.*?("|])', 'g'), function (match) {
+ const temp = match
+ .replace(new RegExp(mdurl.encode(path.win32.sep), 'g'), path.sep)
+ .replace(new RegExp(mdurl.encode(path.posix.sep), 'g'), path.sep)
+ .replace(new RegExp(escapeStringRegexp(path.win32.sep), 'g'), path.sep)
+ .replace(new RegExp(escapeStringRegexp(path.posix.sep), 'g'), path.sep)
+ return temp.replace(new RegExp(STORAGE_FOLDER_PLACEHOLDER + '(' + escapeStringRegexp(path.sep) + noteKey + ')?', 'g'), DESTINATION_FOLDER)
+ })
}
/**
diff --git a/tests/dataApi/attachmentManagement.test.js b/tests/dataApi/attachmentManagement.test.js
index a4cc8082..470df436 100644
--- a/tests/dataApi/attachmentManagement.test.js
+++ b/tests/dataApi/attachmentManagement.test.js
@@ -171,6 +171,7 @@ it('should replace the all ":storage" path with the actual storage path', functi
it('should replace the ":storage" path with the actual storage path when they have different path separators', function () {
const storageFolder = systemUnderTest.DESTINATION_FOLDER
+ const noteKey = '9c9c4ba3-bc1e-441f-9866-c1e9a806e31c'
const testInput =
'\n' +
' \n' +
@@ -179,10 +180,10 @@ it('should replace the ":storage" path with the actual storage path when they ha
' \n' +
' Headline
\n' +
' \n' +
- '  + '0.6r4zdgc22xp.png)
\n' +
+ '  + noteKey + mdurl.encode(path.win32.sep) + '0.6r4zdgc22xp.png)
\n' +
'
\n' +
' \n' +
- ' dummyPDF.pdf\n' +
+ ' dummyPDF.pdf\n' +
'
\n' +
' \n' +
''
@@ -195,10 +196,10 @@ it('should replace the ":storage" path with the actual storage path when they ha
' \n' +
' Headline
\n' +
' \n' +
- ' 
\n' +
+ ' 
\n' +
'
\n' +
' \n' +
- ' dummyPDF.pdf\n' +
+ ' dummyPDF.pdf\n' +
'
\n' +
' \n' +
''
@@ -251,28 +252,17 @@ it('should test that getAttachmentsInMarkdownContent finds all attachments when
it('should test that getAbsolutePathsOfAttachmentsInContent returns all absolute paths', function () {
const dummyStoragePath = 'dummyStoragePath'
- const testInput =
- '\n' +
- ' \n' +
- ' //header\n' +
- ' \n' +
- ' \n' +
- ' Headline
\n' +
- ' \n' +
- '  + '9c9c4ba3-bc1e-441f-9866-c1e9a806e31c' + mdurl.encode(path.sep) + '0.6r4zdgc22xp.png)
\n' +
- '
\n' +
- ' \n' +
- ' dummyPDF.pdf\n' +
- '
\n' +
- ' \n' +
- '  + '9c9c4ba3-bc1e-441f-9866-c1e9a806e31c' + mdurl.encode(path.sep) + 'd6c5ee92.jpg)
\n' +
- '
\n' +
- ' \n' +
- ''
+ const noteKey = '9c9c4ba3-bc1e-441f-9866-c1e9a806e31c'
+ const testInput = '"# Test\n' +
+ '\n' +
+ '\n' +
+ '\n' +
+ '"'
+
const actual = systemUnderTest.getAbsolutePathsOfAttachmentsInContent(testInput, dummyStoragePath)
- const expected = [dummyStoragePath + path.sep + systemUnderTest.DESTINATION_FOLDER + path.sep + '9c9c4ba3-bc1e-441f-9866-c1e9a806e31c' + path.sep + '0.6r4zdgc22xp.png',
- dummyStoragePath + path.sep + systemUnderTest.DESTINATION_FOLDER + path.sep + '9c9c4ba3-bc1e-441f-9866-c1e9a806e31c' + path.sep + '0.q2i4iw0fyx.pdf',
- dummyStoragePath + path.sep + systemUnderTest.DESTINATION_FOLDER + path.sep + '9c9c4ba3-bc1e-441f-9866-c1e9a806e31c' + path.sep + 'd6c5ee92.jpg']
+ const expected = [dummyStoragePath + path.sep + systemUnderTest.DESTINATION_FOLDER + path.sep + noteKey + path.sep + '0.6r4zdgc22xp.png',
+ dummyStoragePath + path.sep + systemUnderTest.DESTINATION_FOLDER + path.sep + noteKey + path.sep + '0.q2i4iw0fyx.pdf',
+ dummyStoragePath + path.sep + systemUnderTest.DESTINATION_FOLDER + path.sep + noteKey + path.sep + 'd6c5ee92.jpg']
expect(actual).toEqual(expect.arrayContaining(expected))
})
@@ -287,13 +277,13 @@ it('should remove the all ":storage" and noteKey references', function () {
' \n' +
' Headline
\n' +
' \n' +
- '  + noteKey + mdurl.encode(path.sep) + '0.6r4zdgc22xp.png)
\n' +
+ ' \n' +
'
\n' +
' \n' +
- ' dummyPDF.pdf\n' +
+ ' dummyPDF.pdf\n' +
'
\n' +
' \n' +
- '  + noteKey + mdurl.encode(path.sep) + 'd6c5ee92.jpg)
\n' +
+ '  + noteKey + mdurl.encode(path.posix.sep) + 'd6c5ee92.jpg)
\n' +
'
\n' +
' \n' +
'