public/Boostnote
1
0
Fork 0
mirror of https://github.com/BoostIo/Boostnote synced 2025-12-13 09:46:22 +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) {
return input.replace(
new RegExp('/?' + STORAGE_FOLDER_PLACEHOLDER + '.*?("|])', 'g'),
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
)
return match
.replace(new RegExp(mdurl.encode(path.win32.sep), 'g'), path.posix.sep)
.replace(new RegExp(mdurl.encode(path.posix.sep), 'g'), path.posix.sep)
.replace(
new RegExp(escapeStringRegexp(path.win32.sep), 'g'),
path.posix.sep
)
.replace(
new RegExp(escapeStringRegexp(path.posix.sep), 'g'),
path.posix.sep
)
.replace(
new RegExp(
STORAGE_FOLDER_PLACEHOLDER +
'(' +
escapeStringRegexp(path.sep) +
noteKey +
')?',
'g'
),
DESTINATION_FOLDER
)
}
)
}