gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-03-01 14:22:32 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

formatting

Browse Source
This commit is contained in:
zadam 2022-12-27 10:22:50 +01:00
parent 4b779d7512
commit ecc2ed7d73
4 changed files with 54 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/services/cloning.js
View File

@ -35,7 +35,7 @@ function cloneNoteToNote(noteId, parentNoteId, prefix) {
isExpanded: 0 isExpanded: 0
}).save(); }).save();
log.info(`Cloned note ${noteId} to new parent note ${parentNoteId} with prefix ${prefix}`); log.info(`Cloned note '${noteId}' to new parent note '${parentNoteId}' with prefix '${prefix}'`);
return { return {
success: true, success: true,
@ -169,7 +169,7 @@ function cloneNoteAfter(noteId, afterBranchId) {
isExpanded: 0 isExpanded: 0
}).save(); }).save();
log.info(`Cloned note '${noteId}' into parent note '${afterNote.parentNoteId}' after note '${afterNote.noteId}', branch ${afterBranchId}`); log.info(`Cloned note '${noteId}' into parent note '${afterNote.parentNoteId}' after note '${afterNote.noteId}', branch '${afterBranchId}'`);
return { success: true, branchId: branch.branchId }; return { success: true, branchId: branch.branchId };
} }

88
src/services/consistency_checks.js
View File

@ -12,7 +12,7 @@ const Branch = require('../becca/entities/branch');
const noteRevisionService = require('./note_revisions'); const noteRevisionService = require('./note_revisions');
const becca = require("../becca/becca"); const becca = require("../becca/becca");
const utils = require("../services/utils"); const utils = require("../services/utils");
const {sanitizeAttributeName} = require("./sanitize_attribute_name.js"); const {sanitizeAttributeName} = require("./sanitize_attribute_name");
const noteTypes = require("../services/note_types").getNoteTypeNames(); const noteTypes = require("../services/note_types").getNoteTypeNames();
class ConsistencyChecks { class ConsistencyChecks {
@ -72,7 +72,7 @@ class ConsistencyChecks {
return true; return true;
} }
else { else {
logError(`Tree cycle detected at parent-child relationship: ${parentNoteId} - ${noteId}, whole path: ${path}`); logError(`Tree cycle detected at parent-child relationship: '${parentNoteId}' - '${noteId}', whole path: '${path}'`);
this.unrecoveredConsistencyErrors = true; this.unrecoveredConsistencyErrors = true;
} }
@ -133,9 +133,9 @@ class ConsistencyChecks {
this.reloadNeeded = true; this.reloadNeeded = true;
logFix(`Branch ${branchId} has been deleted since it references missing note ${noteId}`); logFix(`Branch '${branchId}' has been deleted since it references missing note '${noteId}'`);
} else { } else {
logError(`Branch ${branchId} references missing note ${noteId}`); logError(`Branch '${branchId}' references missing note '${noteId}'`);
} }
}); });
@ -154,9 +154,9 @@ class ConsistencyChecks {
this.reloadNeeded = true; this.reloadNeeded = true;
logFix(`Branch ${branchId} was set to root parent since it was referencing missing parent note ${parentNoteId}`); logFix(`Branch '${branchId}' was set to root parent since it was referencing missing parent note '${parentNoteId}'`);
} else { } else {
logError(`Branch ${branchId} references missing parent note ${parentNoteId}`); logError(`Branch '${branchId}' references missing parent note '${parentNoteId}'`);
} }
}); });
@ -173,9 +173,9 @@ class ConsistencyChecks {
this.reloadNeeded = true; this.reloadNeeded = true;
logFix(`Attribute ${attributeId} has been deleted since it references missing source note ${noteId}`); logFix(`Attribute '${attributeId}' has been deleted since it references missing source note '${noteId}'`);
} else { } else {
logError(`Attribute ${attributeId} references missing source note ${noteId}`); logError(`Attribute '${attributeId}' references missing source note '${noteId}'`);
} }
}); });
@ -193,9 +193,9 @@ class ConsistencyChecks {
this.reloadNeeded = true; this.reloadNeeded = true;
logFix(`Relation ${attributeId} has been deleted since it references missing note ${noteId}`) logFix(`Relation '${attributeId}' has been deleted since it references missing note '${noteId}'`)
} else { } else {
logError(`Relation ${attributeId} references missing note ${noteId}`) logError(`Relation '${attributeId}' references missing note '${noteId}'`)
} }
}); });
} }
@ -220,9 +220,9 @@ class ConsistencyChecks {
this.reloadNeeded = true; this.reloadNeeded = true;
logFix(`Branch ${branchId} has been deleted since associated note ${noteId} is deleted.`); logFix(`Branch '${branchId}' has been deleted since associated note '${noteId}' is deleted.`);
} else { } else {
logError(`Branch ${branchId} is not deleted even though associated note ${noteId} is deleted.`) logError(`Branch '${branchId}' is not deleted even though associated note '${noteId}' is deleted.`)
} }
}); });
@ -240,9 +240,9 @@ class ConsistencyChecks {
this.reloadNeeded = true; this.reloadNeeded = true;
logFix(`Branch ${branchId} has been deleted since associated parent note ${parentNoteId} is deleted.`); logFix(`Branch '${branchId}' has been deleted since associated parent note '${parentNoteId}' is deleted.`);
} else { } else {
logError(`Branch ${branchId} is not deleted even though associated parent note ${parentNoteId} is deleted.`) logError(`Branch '${branchId}' is not deleted even though associated parent note '${parentNoteId}' is deleted.`)
} }
}); });
@ -262,9 +262,9 @@ class ConsistencyChecks {
this.reloadNeeded = true; this.reloadNeeded = true;
logFix(`Created missing branch ${branch.branchId} for note ${noteId}`); logFix(`Created missing branch '${branch.branchId}' for note '${noteId}'`);
} else { } else {
logError(`No undeleted branch found for note ${noteId}`); logError(`No undeleted branch found for note '${noteId}'`);
} }
}); });
@ -296,12 +296,12 @@ class ConsistencyChecks {
for (const branch of branches.slice(1)) { for (const branch of branches.slice(1)) {
branch.markAsDeleted(); branch.markAsDeleted();
logFix(`Removing branch ${branch.branchId} since it's parent-child duplicate of branch ${origBranch.branchId}`); logFix(`Removing branch '${branch.branchId}' since it's parent-child duplicate of branch '${origBranch.branchId}'`);
} }
this.reloadNeeded = true; this.reloadNeeded = true;
} else { } else {
logError(`Duplicate branches for note ${noteId} and parent ${parentNoteId}`); logError(`Duplicate branches for note '${noteId}' and parent '${parentNoteId}'`);
} }
}); });
} }
@ -322,9 +322,9 @@ class ConsistencyChecks {
this.reloadNeeded = true; this.reloadNeeded = true;
logFix(`Note ${noteId} type has been change to file since it had invalid type=${type}`) logFix(`Note '${noteId}' type has been change to file since it had invalid type '${type}'`)
} else { } else {
logError(`Note ${noteId} has invalid type=${type}`); logError(`Note '${noteId}' has invalid type '${type}'`);
} }
}); });
@ -361,9 +361,9 @@ class ConsistencyChecks {
this.reloadNeeded = true; this.reloadNeeded = true;
logFix(`Note ${noteId} content was set to empty string since there was no corresponding row`); logFix(`Note '${noteId}' content was set to empty string since there was no corresponding row`);
} else { } else {
logError(`Note ${noteId} content row does not exist`); logError(`Note '${noteId}' content row does not exist`);
} }
}); });
@ -385,9 +385,9 @@ class ConsistencyChecks {
this.reloadNeeded = true; this.reloadNeeded = true;
logFix(`Note ${noteId} content was set to "${blankContent}" since it was null even though it is not deleted`); logFix(`Note '${noteId}' content was set to '${blankContent}' since it was null even though it is not deleted`);
} else { } else {
logError(`Note ${noteId} content is null even though it is not deleted`); logError(`Note '${noteId}' content is null even though it is not deleted`);
} }
}); });
} }
@ -404,9 +404,9 @@ class ConsistencyChecks {
this.reloadNeeded = true; this.reloadNeeded = true;
logFix(`Note revision content ${noteRevisionId} was created and set to erased since it did not exist.`); logFix(`Note revision content '${noteRevisionId}' was created and set to erased since it did not exist.`);
} else { } else {
logError(`Note revision content ${noteRevisionId} does not exist`); logError(`Note revision content '${noteRevisionId}' does not exist`);
} }
}); });
@ -431,12 +431,12 @@ class ConsistencyChecks {
branch.parentNoteId = 'root'; branch.parentNoteId = 'root';
branch.save(); branch.save();
logFix(`Child branch ${branch.branchId} has been moved to root since it was a child of a search note ${parentNoteId}`) logFix(`Child branch '${branch.branchId}' has been moved to root since it was a child of a search note '${parentNoteId}'`)
} }
this.reloadNeeded = true; this.reloadNeeded = true;
} else { } else {
logError(`Search note ${parentNoteId} has children`); logError(`Search note '${parentNoteId}' has children`);
} }
}); });
@ -453,9 +453,9 @@ class ConsistencyChecks {
this.reloadNeeded = true; this.reloadNeeded = true;
logFix(`Removed relation ${relation.attributeId} of name "${relation.name} with empty target.`); logFix(`Removed relation '${relation.attributeId}' of name '${relation.name}' with empty target.`);
} else { } else {
logError(`Relation ${attributeId} has empty target.`); logError(`Relation '${attributeId}' has empty target.`);
} }
}); });
@ -474,9 +474,9 @@ class ConsistencyChecks {
this.reloadNeeded = true; this.reloadNeeded = true;
logFix(`Attribute ${attributeId} type was changed to label since it had invalid type '${type}'`); logFix(`Attribute '${attributeId}' type was changed to label since it had invalid type '${type}'`);
} else { } else {
logError(`Attribute ${attributeId} has invalid type '${type}'`); logError(`Attribute '${attributeId}' has invalid type '${type}'`);
} }
}); });
@ -494,9 +494,9 @@ class ConsistencyChecks {
this.reloadNeeded = true; this.reloadNeeded = true;
logFix(`Removed attribute ${attributeId} because owning note ${noteId} is also deleted.`); logFix(`Removed attribute '${attributeId}' because owning note '${noteId}' is also deleted.`);
} else { } else {
logError(`Attribute ${attributeId} is not deleted even though owning note ${noteId} is deleted.`); logError(`Attribute '${attributeId}' is not deleted even though owning note '${noteId}' is deleted.`);
} }
}); });
@ -515,9 +515,9 @@ class ConsistencyChecks {
this.reloadNeeded = true; this.reloadNeeded = true;
logFix(`Removed attribute ${attributeId} because target note ${targetNoteId} is also deleted.`); logFix(`Removed attribute '${attributeId}' because target note '${targetNoteId}' is also deleted.`);
} else { } else {
logError(`Attribute ${attributeId} is not deleted even though target note ${targetNoteId} is deleted.`); logError(`Attribute '${attributeId}' is not deleted even though target note '${targetNoteId}' is deleted.`);
} }
}); });
} }
@ -545,9 +545,9 @@ class ConsistencyChecks {
isSynced: entityName !== 'options' || entity.isSynced isSynced: entityName !== 'options' || entity.isSynced
}); });
logFix(`Created missing entity change for entityName=${entityName}, entityId=${entityId}`); logFix(`Created missing entity change for entityName '${entityName}', entityId '${entityId}'`);
} else { } else {
logError(`Missing entity change for entityName=${entityName}, entityId=${entityId}`); logError(`Missing entity change for entityName '${entityName}', entityId '${entityId}'`);
} }
}); });
@ -565,9 +565,9 @@ class ConsistencyChecks {
if (this.autoFix) { if (this.autoFix) {
sql.execute("DELETE FROM entity_changes WHERE entityName = ? AND entityId = ?", [entityName, entityId]); sql.execute("DELETE FROM entity_changes WHERE entityName = ? AND entityId = ?", [entityName, entityId]);
logFix(`Deleted extra entity change id=${id}, entityName=${entityName}, entityId=${entityId}`); logFix(`Deleted extra entity change id '${id}', entityName '${entityName}', entityId '${entityId}'`);
} else { } else {
logError(`Unrecognized entity change id=${id}, entityName=${entityName}, entityId=${entityId}`); logError(`Unrecognized entity change id '${id}', entityName '${entityName}', entityId '${entityId}'`);
} }
}); });
@ -586,9 +586,9 @@ class ConsistencyChecks {
this.reloadNeeded = true; this.reloadNeeded = true;
logFix(`Erasing entityName=${entityName}, entityId=${entityId} since entity change id=${id} has it as erased.`); logFix(`Erasing entityName '${entityName}', entityId '${entityId}' since entity change id '${id}' has it as erased.`);
} else { } else {
logError(`Entity change id=${id} has entityName=${entityName}, entityId=${entityId} as erased, but it's not.`); logError(`Entity change id '${id}' has entityName '${entityName}', entityId '${entityId}' as erased, but it's not.`);
} }
}); });
} }
@ -621,12 +621,12 @@ class ConsistencyChecks {
this.fixedIssues = true; this.fixedIssues = true;
this.reloadNeeded = true; this.reloadNeeded = true;
logFix(`Renamed incorrectly named attributes "${origName}" to ${fixedName}`); logFix(`Renamed incorrectly named attributes '${origName}' to '${fixedName}'`);
} }
else { else {
this.unrecoveredConsistencyErrors = true; this.unrecoveredConsistencyErrors = true;
logFix(`There are incorrectly named attributes "${origName}"`); logFix(`There are incorrectly named attributes '${origName}'`);
} }
} }
} }

2
src/services/entity_changes.js
View File

@ -71,7 +71,7 @@ function addEntityChangesForSector(entityName, sector) {
} }
}); });
log.info(`Added sector ${sector} of ${entityName} to sync queue in ${Date.now() - startTime}ms.`); log.info(`Added sector ${sector} of '${entityName}' to sync queue in ${Date.now() - startTime}ms.`);
} }
function cleanupEntityChangesForMissingEntities(entityName, entityPrimaryKey) { function cleanupEntityChangesForMissingEntities(entityName, entityPrimaryKey) {

13
src/services/sync_update.js
View File

@ -42,7 +42,7 @@ function updateEntity(entityChange, entityRow, instanceId) {
} }
} }
function updateNormalEntity(remoteEntityChange, entity, instanceId) { function updateNormalEntity(remoteEntityChange, remoteEntityRow, instanceId) {
const localEntityChange = sql.getRow(` const localEntityChange = sql.getRow(`
SELECT utcDateChanged, hash, isErased SELECT utcDateChanged, hash, isErased
FROM entity_changes FROM entity_changes
@ -65,11 +65,11 @@ function updateNormalEntity(remoteEntityChange, entity, instanceId) {
|| localEntityChange.hash !== remoteEntityChange.hash // sync error, we should still update || localEntityChange.hash !== remoteEntityChange.hash // sync error, we should still update
) { ) {
if (['note_contents', 'note_revision_contents'].includes(remoteEntityChange.entityName)) { if (['note_contents', 'note_revision_contents'].includes(remoteEntityChange.entityName)) {
entity.content = handleContent(entity.content); remoteEntityRow.content = handleContent(remoteEntityRow.content);
} }
sql.transactional(() => { sql.transactional(() => {
sql.replace(remoteEntityChange.entityName, entity); sql.replace(remoteEntityChange.entityName, remoteEntityRow);
entityChangesService.addEntityChangeWithInstanceId(remoteEntityChange, instanceId); entityChangesService.addEntityChangeWithInstanceId(remoteEntityChange, instanceId);
}); });
@ -93,8 +93,9 @@ function updateNoteReordering(entityChange, entity, instanceId) {
} }
function handleContent(content) { function handleContent(content) {
// we always use Buffer object which is different from normal saving - there we use simple string type for "string notes" // we always use Buffer object which is different from normal saving - there we use simple string type for
// the problem is that in general it's not possible to whether a note_content is string note or note (syncs can arrive out of order) // "string notes". The problem is that in general it's not possible to detect whether a note_content
// is string note or note (syncs can arrive out of order)
content = content === null ? null : Buffer.from(content, 'base64'); content = content === null ? null : Buffer.from(content, 'base64');
if (content && content.byteLength === 0) { if (content && content.byteLength === 0) {
@ -109,7 +110,7 @@ function eraseEntity(entityChange, instanceId) {
const {entityName, entityId} = entityChange; const {entityName, entityId} = entityChange;
if (!["notes", "note_contents", "branches", "attributes", "note_revisions", "note_revision_contents"].includes(entityName)) { if (!["notes", "note_contents", "branches", "attributes", "note_revisions", "note_revision_contents"].includes(entityName)) {
log.error(`Cannot erase entity ${entityName}, id ${entityId}`); log.error(`Cannot erase entity '${entityName}', id '${entityId}'`);
return; return;
} }