mirror of
https://github.com/BoostIo/Boostnote
synced 2025-12-13 17:56:25 +00:00
adjust keygen to use uuid only for notes (uuid on storage/folders woud need more refactoring)
This commit is contained in:
@@ -1,5 +1,11 @@
|
||||
const crypto = require('crypto')
|
||||
const _ = require('lodash')
|
||||
const uuidv4 = require('uuid/v4')
|
||||
|
||||
module.exports = function () {
|
||||
module.exports = function (uuid) {
|
||||
if (typeof uuid === typeof true && uuid) {
|
||||
return uuidv4()
|
||||
}
|
||||
const length = 10
|
||||
return crypto.randomBytes(length).toString('hex')
|
||||
}
|
||||
|
||||
@@ -52,12 +52,12 @@ function createNote (storageKey, input) {
|
||||
return storage
|
||||
})
|
||||
.then(function saveNote (storage) {
|
||||
let key = keygen()
|
||||
let key = keygen(true)
|
||||
let isUnique = false
|
||||
while (!isUnique) {
|
||||
try {
|
||||
sander.statSync(path.join(storage.path, 'notes', key + '.cson'))
|
||||
key = keygen()
|
||||
key = keygen(true)
|
||||
} catch (err) {
|
||||
if (err.code === 'ENOENT') {
|
||||
isUnique = true
|
||||
|
||||
@@ -37,12 +37,12 @@ function moveNote (storageKey, noteKey, newStorageKey, newFolderKey) {
|
||||
return resolveStorageData(newStorage)
|
||||
.then(function findNewNoteKey (_newStorage) {
|
||||
newStorage = _newStorage
|
||||
newNoteKey = keygen()
|
||||
newNoteKey = keygen(true)
|
||||
let isUnique = false
|
||||
while (!isUnique) {
|
||||
try {
|
||||
sander.statSync(path.join(newStorage.path, 'notes', newNoteKey + '.cson'))
|
||||
newNoteKey = keygen()
|
||||
newNoteKey = keygen(true)
|
||||
} catch (err) {
|
||||
if (err.code === 'ENOENT') {
|
||||
isUnique = true
|
||||
|
||||
8
tests/fixtures/TestDummy.js
vendored
8
tests/fixtures/TestDummy.js
vendored
@@ -107,9 +107,9 @@ function dummyStorage (storagePath, override = {}) {
|
||||
var notesData = []
|
||||
var noteCount = Math.floor((Math.random() * 15)) + 1
|
||||
for (var i = 0; i < noteCount; i++) {
|
||||
var key = keygen()
|
||||
var key = keygen(true)
|
||||
while (notesData.some((note) => note.key === key)) {
|
||||
key = keygen()
|
||||
key = keygen(true)
|
||||
}
|
||||
|
||||
var noteData = dummyNote({
|
||||
@@ -149,9 +149,9 @@ function dummyLegacyStorage (storagePath, override = {}) {
|
||||
var folderNotes = []
|
||||
var noteCount = Math.floor((Math.random() * 5)) + 1
|
||||
for (var i = 0; i < noteCount; i++) {
|
||||
var key = keygen()
|
||||
var key = keygen(true)
|
||||
while (folderNotes.some((note) => note.key === key)) {
|
||||
key = keygen()
|
||||
key = keygen(true)
|
||||
}
|
||||
|
||||
var noteData = dummyNote({
|
||||
|
||||
Reference in New Issue
Block a user