Mirrors/notesnook
1
0
Fork 0
mirror of https://github.com/streetwriters/notesnook.git synced 2025-12-23 23:19:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor: make code more DRY

Browse Source
This commit is contained in:
thecodrr
2019-12-05 16:17:55 +05:00
parent f0c912baa2
commit adfde20b1d
2 changed files with 36 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
packages/core/api/database.js
View File

@@ -47,7 +47,7 @@ class Database {
content: note.content,
pinned: note.pinned || false,
tags: note.tags || [],
notebooks: note.notebooks || [],
notebooks: note.notebooks || {},
colors: note.colors || [],
favorite: note.favorite || false,
headline: note.content.text.substring(0, 150) + "...",
@@ -160,10 +160,10 @@ class Database {
* @param {number} noteId The ID of the note
*/
addNoteToTopic(notebookId, topic, noteId) {
return notebookTopicFn.call(this, notebookId, topic, notebook => {
if (!notebook.topics.hasOwnProperty(topic)) return false;
let nbTopic = notebook.topics[topic];
notebook.topics[topic][nbTopic.length] = noteId;
return topicNoteFn.call(this, notebookId, topic, noteId, async notebook => {
notebook.topics[topic][notebook.topics[topic].length] = noteId;
//add notebookId to the note
this.notes[noteId].notebooks[notebookId] = notebook.title;
return true;
});
}
@@ -175,12 +175,12 @@ class Database {
* @param {number} noteId The ID of the note
*/
deleteNoteFromTopic(notebookId, topic, noteId) {
return notebookTopicFn.call(this, notebookId, topic, notebook => {
if (!notebook.topics[topic]) return false;
let nbTopic = notebook.topics[topic];
let index = nbTopic.indexOf(noteId);
if (index <= -1) return;
return topicNoteFn.call(this, notebookId, topic, noteId, async notebook => {
let index = notebook.topics[topic].indexOf(noteId);
if (index <= -1) return false;
notebook.topics[topic].splice(index, 1);
//delete notebook from note
delete this.notes[noteId].notebooks[notebookId];
return true;
});
}
@@ -242,6 +242,22 @@ function notebookTopicFn(notebookId, topic, fn) {
return Promise.resolve();
}
function topicNoteFn(notebookId, topic, noteId, fn) {
return notebookTopicFn.call(this, notebookId, topic, async notebook => {
if (
!notebook.topics.hasOwnProperty(topic) ||
!this.notes.hasOwnProperty(noteId)
)
return false;
if (fn(notebook)) {
await this.storage.write(KEYS.notes, this.notes);
return true;
}
return false;
});
}
function getItem(id, key) {
if (this[key].hasOwnProperty(id)) {
return this[key][id];