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

adjust keygen to use uuid only for notes (uuid on storage/folders woud need more refactoring)

Browse Source
This commit is contained in:
mirsch
2018-03-05 00:02:30 +01:00
parent fa2d34dcfc
commit b74ba22c44
4 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
browser/lib/keygen.js
View File

@@ -1,5 +1,11 @@
const crypto = require('crypto')
const _ = require('lodash')
const uuidv4 = require('uuid/v4') const uuidv4 = require('uuid/v4')
module.exports = function () { module.exports = function (uuid) {
return uuidv4() if (typeof uuid === typeof true && uuid) {
return uuidv4()
}
const length = 10
return crypto.randomBytes(length).toString('hex')
} }

4
browser/main/lib/dataApi/createNote.js
View File

@@ -52,12 +52,12 @@ function createNote (storageKey, input) {
return storage return storage
}) })
.then(function saveNote (storage) { .then(function saveNote (storage) {
let key = keygen() let key = keygen(true)
let isUnique = false let isUnique = false
while (!isUnique) { while (!isUnique) {
try { try {
sander.statSync(path.join(storage.path, 'notes', key + '.cson')) sander.statSync(path.join(storage.path, 'notes', key + '.cson'))
key = keygen() key = keygen(true)
} catch (err) { } catch (err) {
if (err.code === 'ENOENT') { if (err.code === 'ENOENT') {
isUnique = true isUnique = true

4
browser/main/lib/dataApi/moveNote.js
View File

@@ -37,12 +37,12 @@ function moveNote (storageKey, noteKey, newStorageKey, newFolderKey) {
return resolveStorageData(newStorage) return resolveStorageData(newStorage)
.then(function findNewNoteKey (_newStorage) { .then(function findNewNoteKey (_newStorage) {
newStorage = _newStorage newStorage = _newStorage
newNoteKey = keygen() newNoteKey = keygen(true)
let isUnique = false let isUnique = false
while (!isUnique) { while (!isUnique) {
try { try {
sander.statSync(path.join(newStorage.path, 'notes', newNoteKey + '.cson')) sander.statSync(path.join(newStorage.path, 'notes', newNoteKey + '.cson'))
newNoteKey = keygen() newNoteKey = keygen(true)
} catch (err) { } catch (err) {
if (err.code === 'ENOENT') { if (err.code === 'ENOENT') {
isUnique = true isUnique = true

8
tests/fixtures/TestDummy.js vendored
View File

@@ -107,9 +107,9 @@ function dummyStorage (storagePath, override = {}) {
var notesData = [] var notesData = []
var noteCount = Math.floor((Math.random() * 15)) + 1 var noteCount = Math.floor((Math.random() * 15)) + 1
for (var i = 0; i < noteCount; i++) { for (var i = 0; i < noteCount; i++) {
var key = keygen() var key = keygen(true)
while (notesData.some((note) => note.key === key)) { while (notesData.some((note) => note.key === key)) {
key = keygen() key = keygen(true)
} }
var noteData = dummyNote({ var noteData = dummyNote({
@@ -149,9 +149,9 @@ function dummyLegacyStorage (storagePath, override = {}) {
var folderNotes = [] var folderNotes = []
var noteCount = Math.floor((Math.random() * 5)) + 1 var noteCount = Math.floor((Math.random() * 5)) + 1
for (var i = 0; i < noteCount; i++) { for (var i = 0; i < noteCount; i++) {
var key = keygen() var key = keygen(true)
while (folderNotes.some((note) => note.key === key)) { while (folderNotes.some((note) => note.key === key)) {
key = keygen() key = keygen(true)
} }
var noteData = dummyNote({ var noteData = dummyNote({