Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed moving notes with images #1805

Merged
merged 3 commits into from Apr 26, 2018
Merged

Fixed moving notes with images #1805

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7aedb59
Fixed moving notes with images
Apr 12, 2018
daea604
Added spaces
Apr 12, 2018
fbb8b46
Reduced nests
Apr 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 20 additions & 16 deletions browser/main/lib/dataApi/moveNote.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,25 +68,29 @@ function moveNote (storageKey, noteKey, newStorageKey, newFolderKey) {
return noteData
})
.then(function moveImages (noteData) {
const searchImagesRegex = /!\[.*?]\(\s*?\/:storage\/(.*\.\S*?)\)/gi
let match = searchImagesRegex.exec(noteData.content)
if (oldStorage.path === newStorage.path) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think that we should reduce nests.
So I want you to use the style like this:

if (oldStorage.path === newStorage.path) return noteData

// next ...

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, great review! I like your solution, it is much cleaner.

return noteData
} else {
const searchImagesRegex = /!\[.*?]\(\s*?\/:storage\/(.*\.\S*?)\)/gi
let match = searchImagesRegex.exec(noteData.content)

const moveTasks = []
while (match != null) {
const [, filename] = match
const oldPath = path.join(oldStorage.path, 'images', filename)
moveTasks.push(
copyImage(oldPath, noteData.storage, false)
.then(() => {
fs.unlinkSync(oldPath)
})
)
const moveTasks = []
while (match != null) {
const [, filename] = match
const oldPath = path.join(oldStorage.path, 'images', filename)
moveTasks.push(
copyImage(oldPath, noteData.storage, false)
.then(() => {
fs.unlinkSync(oldPath)
})
)

// find next occurence
match = searchImagesRegex.exec(noteData.content)
}
// find next occurence
match = searchImagesRegex.exec(noteData.content)
}

return Promise.all(moveTasks).then(() => noteData)
return Promise.all(moveTasks).then(() => noteData)
}
})
.then(function writeAndReturn (noteData) {
CSON.writeFileSync(path.join(newStorage.path, 'notes', noteData.key + '.cson'), _.omit(noteData, ['key', 'storage']))
Expand Down