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

Merge branch 'master' into canvas

Browse Source
This commit is contained in:
azivner
2018-10-23 18:11:29 +02:00
parent 6559e6c25b 9f0860edab
commit b17f442d1f
10 changed files with 56 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/services/app_info.js
View File

@@ -3,7 +3,7 @@
const build = require('./build');
const packageJson = require('../../package');
const APP_DB_VERSION = 113;
const APP_DB_VERSION = 114;
const SYNC_VERSION = 1;
module.exports = {

14
src/services/consistency_checks.js
View File

@@ -28,10 +28,7 @@ async function checkTreeCycles(errorList) {
const childNoteId = row.noteId;
const parentNoteId = row.parentNoteId;
if (!childToParents[childNoteId]) {
childToParents[childNoteId] = [];
}
childToParents[childNoteId] = childToParents[childNoteId] || [];
childToParents[childNoteId].push(parentNoteId);
}
@@ -40,6 +37,11 @@ async function checkTreeCycles(errorList) {
return;
}
if (!childToParents[noteId] || childToParents[noteId].length === 0) {
errorList.push(`No parents found for noteId=${noteId}`);
return;
}
for (const parentNoteId of childToParents[noteId]) {
if (path.includes(parentNoteId)) {
errorList.push(`Tree cycle detected at parent-child relationship: ${parentNoteId} - ${noteId}, whole path: ${path}`);
@@ -58,6 +60,10 @@ async function checkTreeCycles(errorList) {
for (const noteId of noteIds) {
checkTreeCycle(noteId, [], errorList);
}
if (childToParents['root'].length !== 1 || childToParents['root'][0] !== 'none') {
errorList.push('Incorrect root parent: ' + JSON.stringify(childToParents['root']));
}
}
async function runSyncRowChecks(table, key, errorList) {

9
src/services/tree.js
View File

@@ -7,6 +7,15 @@ const syncTableService = require('./sync_table');
const protectedSessionService = require('./protected_session');
async function validateParentChild(parentNoteId, childNoteId, branchId = null) {
if (childNoteId === 'root') {
return { success: false, message: 'Cannot move root note.'};
}
if (parentNoteId === 'none') {
// this shouldn't happen
return { success: false, message: 'Cannot move anything into root parent.' };
}
const existing = await getExistingBranch(parentNoteId, childNoteId);
if (existing && (branchId === null || existing.branchId !== branchId)) {