public/Boostnote
1
0
Fork 0
mirror of https://github.com/BoostIo/Boostnote synced 2025-12-16 03:06:27 +00:00
Code Issues Releases Wiki Activity

fixing identation and regex

Browse Source
This commit is contained in:
anasasilva
2018-12-12 13:06:30 +00:00
committed by Junyoung Choi
parent 85cb94d99d
commit 65926fea73
2 changed files with 44 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
browser/main/NoteList/index.js
View File

@@ -919,10 +919,9 @@ class NoteList extends React.Component {
} }
dataApi.createNote(storage.key, newNote) dataApi.createNote(storage.key, newNote)
.then((note) => { .then((note) => {
attachmentManagement.importAttachments(note.content, filepath, storage.key, note.key) attachmentManagement.importAttachments(note.content, filepath, storage.key, note.key)
.then((newcontent) => { .then((newcontent) => {
note.content = newcontent; note.content = newcontent
dispatch({ dispatch({
type: 'UPDATE_NOTE', type: 'UPDATE_NOTE',
@@ -932,7 +931,6 @@ class NoteList extends React.Component {
pathname: location.pathname, pathname: location.pathname,
query: {key: getNoteKey(note)} query: {key: getNoteKey(note)}
}) })
}) })
}) })
}) })

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

@@ -458,33 +458,27 @@ function getAbsolutePathsOfAttachmentsInContent (markdownContent, storagePath) {
*/ */
function importAttachments (markDownContent, filepath, storageKey, noteKey) { function importAttachments (markDownContent, filepath, storageKey, noteKey) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
let attach_names = markDownContent.match(/!\[.+?]\((?:.+?\..+?\))/g); const nameRegex = /(!\[.+?]\()(.+?\..+?)(\))/g
let attachName = nameRegex.exec(markDownContent)
const promiseArray = []
const beginPath = filepath.match(/\/.+\//)[0]
const endPath = []
const groupIndex = 2
if (!attach_names) while (attachName) {
resolve(markDownContent); endPath.push(attachName[groupIndex])
const finalPath = path.join(beginPath, attachName[groupIndex])
else { promiseArray.push(this.copyAttachment(finalPath, storageKey, noteKey))
let promise_array = []; attachName = nameRegex.exec(markDownContent)
let end_path = []
for (let i = 0; i < attach_names.length; i++){
end_path[i] = attach_names[i].match(/(?<=]\()(?:.+?\..+?)(?=\))/)[0];
let begin_path = filepath.match(/\/.+\//)[0];
let final_path = path.join(begin_path, end_path[i]);
promise_array.push(this.copyAttachment(final_path, storageKey, noteKey));
} }
Promise.all(promise_array).then((file_names) => { Promise.all(promiseArray).then((fileNames) => {
for (let j = 0; j < fileNames.length; j++) {
for (let j = 0; j < file_names.length; j++) { const newPath = path.join(STORAGE_FOLDER_PLACEHOLDER, noteKey, fileNames[j])
let new_path = path.join(STORAGE_FOLDER_PLACEHOLDER, noteKey, file_names[j]); markDownContent = markDownContent.replace(endPath[j], newPath)
markDownContent = markDownContent.replace(end_path[j], new_path);
} }
resolve(markDownContent)
resolve(markDownContent);
}) })
}
}) })
} }