Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-31 10:26:08 +01:00
Code Issues Packages Projects Releases Activity

refactoring of note deletion

Browse Source
This commit is contained in:
azivner
2018-03-31 23:08:22 -04:00
parent 4f200c73dc
commit 12439d8761
9 changed files with 46 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/services/notes.js
View File

@@ -115,7 +115,7 @@ async function createNote(parentNoteId, title, content = "", extraOptions = {})
async function protectNoteRecursively(note, protect) {
await protectNote(note, protect);
for (const child of await note.getChildren()) {
for (const child of await note.getChildNotes()) {
await protectNoteRecursively(child, protect);
}
}
@@ -229,30 +229,23 @@ async function updateNote(noteId, noteUpdates) {
await protectNoteRevisions(note);
}
async function deleteNote(branchId) {
const branch = await sql.getRowOrNull("SELECT * FROM branches WHERE branchId = ?", [branchId]);
async function deleteNote(branch) {
if (!branch || branch.isDeleted === 1) {
return;
}
const now = utils.nowDate();
branch.isDeleted = true;
await branch.save();
await sql.execute("UPDATE branches SET isDeleted = 1, dateModified = ? WHERE branchId = ?", [now, branchId]);
await sync_table.addBranchSync(branchId);
const note = await branch.getNote();
const notDeletedBranches = await note.getBranches();
const noteId = await sql.getValue("SELECT noteId FROM branches WHERE branchId = ?", [branchId]);
if (notDeletedBranches.length === 0) {
note.isDeleted = true;
await note.save();
const notDeletedBranchsCount = await sql.getValue("SELECT COUNT(*) FROM branches WHERE noteId = ? AND isDeleted = 0", [noteId]);
if (!notDeletedBranchsCount) {
await sql.execute("UPDATE notes SET isDeleted = 1, dateModified = ? WHERE noteId = ?", [now, noteId]);
await sync_table.addNoteSync(noteId);
const children = await sql.getRows("SELECT branchId FROM branches WHERE parentNoteId = ? AND isDeleted = 0", [noteId]);
for (const child of children) {
await deleteNote(child.branchId);
for (const childBranch of await note.getChildBranches()) {
await deleteNote(childBranch);
}
}
}