sascha
/
Notes
mirror of https://github.com/TriliumNext/Notes
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

added "reloadNeeded" to consistency checks so that entity changes fix won't force reload

pull/255/head
zadam 2021-10-03 10:00:38 +07:00
parent e4a483aefe
commit a1c1c7c830
1 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/services/consistency_checks.js
Unescape Escape View File

@ -19,6 +19,7 @@ class ConsistencyChecks {
this.autoFix = autoFix;
this.unrecoveredConsistencyErrors = false;
this.fixedIssues = false;
this.reloadNeeded = false;
}
findAndFixIssues(query, fixerCb) {
@ -104,6 +105,8 @@ class ConsistencyChecks {
const branch = becca.getBranch(branchId);
branch.markAsDeleted();
this.reloadNeeded = true;
logFix(`Branch ${branchId} has been deleted since it references missing note ${noteId}`);
} else {
logError(`Branch ${branchId} references missing note ${noteId}`);
@ -123,6 +126,8 @@ class ConsistencyChecks {
branch.parentNoteId = 'root';
branch.save();
this.reloadNeeded = true;
logFix(`Branch ${branchId} was set to root parent since it was referencing missing parent note ${parentNoteId}`);
} else {
logError(`Branch ${branchId} references missing parent note ${parentNoteId}`);
@ -140,6 +145,8 @@ class ConsistencyChecks {
const attribute = becca.getAttribute(attributeId);
attribute.markAsDeleted();
this.reloadNeeded = true;
logFix(`Attribute ${attributeId} has been deleted since it references missing source note ${noteId}`);
} else {
logError(`Attribute ${attributeId} references missing source note ${noteId}`);
@ -158,6 +165,8 @@ class ConsistencyChecks {
const attribute = becca.getAttribute(attributeId);
attribute.markAsDeleted();
this.reloadNeeded = true;
logFix(`Relation ${attributeId} has been deleted since it references missing note ${noteId}`)
} else {
logError(`Relation ${attributeId} references missing note ${noteId}`)
@ -183,6 +192,8 @@ class ConsistencyChecks {
const branch = becca.getBranch(branchId);
branch.markAsDeleted();
this.reloadNeeded = true;
logFix(`Branch ${branchId} has been deleted since associated note ${noteId} is deleted.`);
} else {
logError(`Branch ${branchId} is not deleted even though associated note ${noteId} is deleted.`)
@ -201,6 +212,8 @@ class ConsistencyChecks {
const branch = becca.getBranch(branchId);
branch.markAsDeleted();
this.reloadNeeded = true;
logFix(`Branch ${branchId} has been deleted since associated parent note ${parentNoteId} is deleted.`);
} else {
logError(`Branch ${branchId} is not deleted even though associated parent note ${parentNoteId} is deleted.`)
@ -221,6 +234,8 @@ class ConsistencyChecks {
prefix: 'recovered'
}).save();
this.reloadNeeded = true;
logFix(`Created missing branch ${branch.branchId} for note ${noteId}`);
} else {
logError(`No undeleted branch found for note ${noteId}`);
@ -256,6 +271,8 @@ class ConsistencyChecks {
logFix(`Removing branch ${branch.branchId} since it's parent-child duplicate of branch ${origBranch.branchId}`);
}
this.reloadNeeded = true;
} else {
logError(`Duplicate branches for note ${noteId} and parent ${parentNoteId}`);
}
@ -274,6 +291,8 @@ class ConsistencyChecks {
note.type = 'file'; // file is a safe option to recover notes if type is not known
note.save();
this.reloadNeeded = true;
logFix(`Note ${noteId} type has been change to file since it had invalid type=${type}`)
} else {
logError(`Note ${noteId} has invalid type=${type}`);
@ -311,6 +330,8 @@ class ConsistencyChecks {
isSynced: true
});
this.reloadNeeded = true;
logFix(`Note ${noteId} content was set to empty string since there was no corresponding row`);
} else {
logError(`Note ${noteId} content row does not exist`);
@ -330,6 +351,8 @@ class ConsistencyChecks {
const blankContent = getBlankContent(false, type, mime);
note.setContent(blankContent);
this.reloadNeeded = true;
logFix(`Note ${noteId} content was set to "${blankContent}" since it was null even though it is not deleted`);
} else {
logError(`Note ${noteId} content is null even though it is not deleted`);
@ -346,6 +369,8 @@ class ConsistencyChecks {
if (this.autoFix) {
noteRevisionService.eraseNoteRevisions([noteRevisionId]);
this.reloadNeeded = true;
logFix(`Note revision content ${noteRevisionId} was created and set to erased since it did not exist.`);
} else {
logError(`Note revision content ${noteRevisionId} does not exist`);
@ -375,6 +400,8 @@ class ConsistencyChecks {
logFix(`Child branch ${branch.branchId} has been moved to root since it was a child of a search note ${parentNoteId}`)
}
this.reloadNeeded = true;
} else {
logError(`Search note ${parentNoteId} has children`);
}
@ -391,6 +418,8 @@ class ConsistencyChecks {
const relation = becca.getAttribute(attributeId);
relation.markAsDeleted();
this.reloadNeeded = true;
logFix(`Removed relation ${relation.attributeId} of name "${relation.name} with empty target.`);
} else {
logError(`Relation ${attributeId} has empty target.`);
@ -410,6 +439,8 @@ class ConsistencyChecks {
attribute.type = 'label';
attribute.save();
this.reloadNeeded = true;
logFix(`Attribute ${attributeId} type was changed to label since it had invalid type '${type}'`);
} else {
logError(`Attribute ${attributeId} has invalid type '${type}'`);
@ -428,6 +459,8 @@ class ConsistencyChecks {
const attribute = becca.getAttribute(attributeId);
attribute.markAsDeleted();
this.reloadNeeded = true;
logFix(`Removed attribute ${attributeId} because owning note ${noteId} is also deleted.`);
} else {
logError(`Attribute ${attributeId} is not deleted even though owning note ${noteId} is deleted.`);
@ -447,6 +480,8 @@ class ConsistencyChecks {
const attribute = becca.getAttribute(attributeId);
attribute.markAsDeleted();
this.reloadNeeded = true;
logFix(`Removed attribute ${attributeId} because target note ${targetNoteId} is also deleted.`);
} else {
logError(`Attribute ${attributeId} is not deleted even though target note ${targetNoteId} is deleted.`);
@ -530,6 +565,7 @@ class ConsistencyChecks {
sql.execute('UPDATE attributes SET name = ? WHERE name = ?', [fixedName, origName]);
this.fixedIssues = true;
this.reloadNeeded = true;
logFix(`Renamed incorrectly named attributes "${origName}" to ${fixedName}`);
}
@ -565,6 +601,7 @@ class ConsistencyChecks {
runAllChecksAndFixers() {
this.unrecoveredConsistencyErrors = false;
this.fixedIssues = false;
this.reloadNeeded = false;
this.findBrokenReferenceIssues();
@ -587,7 +624,7 @@ class ConsistencyChecks {
this.checkTreeCycles();
}
if (this.fixedIssues) {
if (this.reloadNeeded) {
require("../becca/becca_loader").reload();
}