public/Boostnote
1
0
Fork 0
mirror of https://github.com/BoostIo/Boostnote synced 2025-12-13 17:56:25 +00:00
Code Issues Releases Wiki Activity

Fix regex

Browse Source
This commit is contained in:
Junyoung Choi
2020-04-16 00:07:45 +09:00
parent ac2cfe5169
commit 461e24bf39
1 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
browser/main/lib/dataApi/attachmentManagement.js
View File

@@ -713,24 +713,30 @@ function replaceNoteKeyWithNewNoteKey(noteContent, oldNoteKey, newNoteKey) {
*/ */
function removeStorageAndNoteReferences(input, noteKey) { function removeStorageAndNoteReferences(input, noteKey) {
return input.replace( return input.replace(
new RegExp('/?' + STORAGE_FOLDER_PLACEHOLDER + '.*?("|])', 'g'), new RegExp('/?' + STORAGE_FOLDER_PLACEHOLDER + '.*?("|\\))', 'g'),
function(match) { function(match) {
const temp = match return match
.replace(new RegExp(mdurl.encode(path.win32.sep), 'g'), path.sep) .replace(new RegExp(mdurl.encode(path.win32.sep), 'g'), path.posix.sep)
.replace(new RegExp(mdurl.encode(path.posix.sep), 'g'), path.sep) .replace(new RegExp(mdurl.encode(path.posix.sep), 'g'), path.posix.sep)
.replace(new RegExp(escapeStringRegexp(path.win32.sep), 'g'), path.sep) .replace(
.replace(new RegExp(escapeStringRegexp(path.posix.sep), 'g'), path.sep) new RegExp(escapeStringRegexp(path.win32.sep), 'g'),
return temp.replace( path.posix.sep
new RegExp( )
STORAGE_FOLDER_PLACEHOLDER + .replace(
'(' + new RegExp(escapeStringRegexp(path.posix.sep), 'g'),
escapeStringRegexp(path.sep) + path.posix.sep
noteKey + )
')?', .replace(
'g' new RegExp(
), STORAGE_FOLDER_PLACEHOLDER +
DESTINATION_FOLDER '(' +
) escapeStringRegexp(path.sep) +
noteKey +
')?',
'g'
),
DESTINATION_FOLDER
)
} }
) )
} }