')
+ .append($('| ').text('Length:'))
+ .append($(' | ').text(ancillary.contentLength))
+ .append($(' | ').text('MIME:'))
+ .append($(' | ').text(ancillary.mime))
+ .append($(' | ').text('Date modified:'))
+ .append($(' | ').text(ancillary.utcDateModified))
+ )
+ )
+ .append(
+ $('')
+ .text(ancillary.content)
+ )
+ );
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/routes/api/notes.js b/src/routes/api/notes.js
index 2083a9858..be69c5aa5 100644
--- a/src/routes/api/notes.js
+++ b/src/routes/api/notes.js
@@ -54,10 +54,10 @@ function createNote(req) {
}
function updateNoteData(req) {
- const {content} = req.body;
+ const {content, ancillaries} = req.body;
const {noteId} = req.params;
- return noteService.updateNoteData(noteId, content);
+ return noteService.updateNoteData(noteId, content, ancillaries);
}
function deleteNote(req) {
@@ -127,6 +127,49 @@ function setNoteTypeMime(req) {
note.save();
}
+function getNoteAncillaries(req) {
+ const includeContent = req.query.includeContent === 'true';
+ const {noteId} = req.params;
+
+ const note = becca.getNote(noteId);
+
+ if (!note) {
+ throw new NotFoundError(`Note '${noteId}' doesn't exist.`);
+ }
+
+ const noteAncillaries = note.getNoteAncillaries();
+
+ return noteAncillaries.map(ancillary => {
+ const pojo = ancillary.getPojo();
+
+ if (includeContent && utils.isStringNote(null, ancillary.mime)) {
+ pojo.content = ancillary.getContent()?.toString();
+ pojo.contentLength = pojo.content.length;
+
+ const MAX_ANCILLARY_LENGTH = 1_000_000;
+
+ if (pojo.content.length > MAX_ANCILLARY_LENGTH) {
+ pojo.content = pojo.content.substring(0, MAX_ANCILLARY_LENGTH);
+ }
+ }
+
+ return pojo;
+ });
+}
+
+function saveNoteAncillary(req) {
+ const {noteId, name} = req.params;
+ const {mime, content} = req.body;
+
+ const note = becca.getNote(noteId);
+
+ if (!note) {
+ throw new NotFoundError(`Note '${noteId}' doesn't exist.`);
+ }
+
+ note.saveNoteAncillary(name, mime, content);
+}
+
function getRelationMap(req) {
const {relationMapNoteId, noteIds} = req.body;
@@ -340,5 +383,7 @@ module.exports = {
eraseDeletedNotesNow,
getDeleteNotesPreview,
uploadModifiedFile,
- forceSaveNoteRevision
+ forceSaveNoteRevision,
+ getNoteAncillaries,
+ saveNoteAncillary
};
diff --git a/src/routes/api/sync.js b/src/routes/api/sync.js
index e2947f096..3600aa743 100644
--- a/src/routes/api/sync.js
+++ b/src/routes/api/sync.js
@@ -114,6 +114,14 @@ function forceNoteSync(req) {
entityChangesService.moveEntityChangeToTop('note_revision_contents', noteRevisionId);
}
+ for (const noteAncillaryId of sql.getColumn("SELECT noteAncillaryId FROM note_ancillaries WHERE noteId = ?", [noteId])) {
+ sql.execute(`UPDATE note_ancillaries SET utcDateModified = ? WHERE noteAncillaryId = ?`, [now, noteAncillaryId]);
+ entityChangesService.moveEntityChangeToTop('note_ancillaries', noteAncillaryId);
+
+ sql.execute(`UPDATE note_ancillary_contents SET utcDateModified = ? WHERE noteAncillaryId = ?`, [now, noteAncillaryId]);
+ entityChangesService.moveEntityChangeToTop('note_ancillary_contents', noteAncillaryId);
+ }
+
log.info(`Forcing note sync for ${noteId}`);
// not awaiting for the job to finish (will probably take a long time)
diff --git a/src/routes/routes.js b/src/routes/routes.js
index cdca32975..b6b5d4e39 100644
--- a/src/routes/routes.js
+++ b/src/routes/routes.js
@@ -126,6 +126,8 @@ function register(app) {
apiRoute(PUT, '/api/notes/:noteId/sort-children', notesApiRoute.sortChildNotes);
apiRoute(PUT, '/api/notes/:noteId/protect/:isProtected', notesApiRoute.protectNote);
apiRoute(PUT, '/api/notes/:noteId/type', notesApiRoute.setNoteTypeMime);
+ apiRoute(GET, '/api/notes/:noteId/ancillaries', notesApiRoute.getNoteAncillaries);
+ apiRoute(PUT, '/api/notes/:noteId/ancillaries/:name', notesApiRoute.saveNoteAncillary);
apiRoute(GET, '/api/notes/:noteId/revisions', noteRevisionsApiRoute.getNoteRevisions);
apiRoute(DELETE, '/api/notes/:noteId/revisions', noteRevisionsApiRoute.eraseAllNoteRevisions);
apiRoute(GET, '/api/notes/:noteId/revisions/:noteRevisionId', noteRevisionsApiRoute.getNoteRevision);
diff --git a/src/services/app_info.js b/src/services/app_info.js
index 3f5f02f3b..5b7582d61 100644
--- a/src/services/app_info.js
+++ b/src/services/app_info.js
@@ -4,8 +4,8 @@ const build = require('./build');
const packageJson = require('../../package');
const {TRILIUM_DATA_DIR} = require('./data_dir');
-const APP_DB_VERSION = 213;
-const SYNC_VERSION = 29;
+const APP_DB_VERSION = 214;
+const SYNC_VERSION = 30;
const CLIPPER_PROTOCOL_VERSION = "1.0";
module.exports = {
diff --git a/src/services/consistency_checks.js b/src/services/consistency_checks.js
index 3fecf607c..6bb6e066d 100644
--- a/src/services/consistency_checks.js
+++ b/src/services/consistency_checks.js
@@ -213,6 +213,25 @@ class ConsistencyChecks {
logError(`Relation '${attributeId}' references missing note '${noteId}'`)
}
});
+
+ this.findAndFixIssues(`
+ SELECT noteAncillaryId, note_ancillaries.noteId AS noteId
+ FROM note_ancillaries
+ LEFT JOIN notes USING (noteId)
+ WHERE notes.noteId IS NULL
+ AND note_ancillaries.isDeleted = 0`,
+ ({noteAncillaryId, noteId}) => {
+ if (this.autoFix) {
+ const noteAncillary = becca.getNoteAncillary(noteAncillaryId);
+ noteAncillary.markAsDeleted();
+
+ this.reloadNeeded = false;
+
+ logFix(`Note ancillary '${noteAncillaryId}' has been deleted since it references missing note '${noteId}'`);
+ } else {
+ logError(`Note ancillary '${noteAncillaryId}' references missing note '${noteId}'`);
+ }
+ });
}
findExistencyIssues() {
@@ -320,6 +339,26 @@ class ConsistencyChecks {
logError(`Duplicate branches for note '${noteId}' and parent '${parentNoteId}'`);
}
});
+
+ this.findAndFixIssues(`
+ SELECT noteAncillaryId,
+ note_ancillaries.noteId AS noteId
+ FROM note_ancillaries
+ JOIN notes USING (noteId)
+ WHERE notes.isDeleted = 1
+ AND note_ancillaries.isDeleted = 0`,
+ ({noteAncillaryId, noteId}) => {
+ if (this.autoFix) {
+ const noteAncillary = becca.getNoteAncillary(noteAncillaryId);
+ noteAncillary.markAsDeleted();
+
+ this.reloadNeeded = false;
+
+ logFix(`Note ancillary '${noteAncillaryId}' has been deleted since associated note '${noteId}' is deleted.`);
+ } else {
+ logError(`Note ancillary '${noteAncillaryId}' is not deleted even though associated note '${noteId}' is deleted.`)
+ }
+ });
}
findLogicIssues() {
@@ -620,6 +659,8 @@ class ConsistencyChecks {
this.runEntityChangeChecks("note_contents", "noteId");
this.runEntityChangeChecks("note_revisions", "noteRevisionId");
this.runEntityChangeChecks("note_revision_contents", "noteRevisionId");
+ this.runEntityChangeChecks("note_ancillaries", "noteAncillaryId");
+ this.runEntityChangeChecks("note_ancillary_contents", "noteAncillaryId");
this.runEntityChangeChecks("branches", "branchId");
this.runEntityChangeChecks("attributes", "attributeId");
this.runEntityChangeChecks("etapi_tokens", "etapiTokenId");
@@ -715,7 +756,7 @@ class ConsistencyChecks {
return `${tableName}: ${count}`;
}
- const tables = [ "notes", "note_revisions", "branches", "attributes", "etapi_tokens" ];
+ const tables = [ "notes", "note_revisions", "note_ancillaries", "branches", "attributes", "etapi_tokens" ];
log.info(`Table counts: ${tables.map(tableName => getTableRowCount(tableName)).join(", ")}`);
}
diff --git a/src/services/entity_changes.js b/src/services/entity_changes.js
index 6f9d5034d..2c3991d81 100644
--- a/src/services/entity_changes.js
+++ b/src/services/entity_changes.js
@@ -151,6 +151,8 @@ function fillAllEntityChanges() {
fillEntityChanges("branches", "branchId");
fillEntityChanges("note_revisions", "noteRevisionId");
fillEntityChanges("note_revision_contents", "noteRevisionId");
+ fillEntityChanges("note_ancillaries", "noteAncillaryId");
+ fillEntityChanges("note_ancillary_contents", "noteAncillaryId");
fillEntityChanges("attributes", "attributeId");
fillEntityChanges("etapi_tokens", "etapiTokenId");
fillEntityChanges("options", "name", 'isSynced = 1');
diff --git a/src/services/export/zip.js b/src/services/export/zip.js
index c58afca9f..8196c9e84 100644
--- a/src/services/export/zip.js
+++ b/src/services/export/zip.js
@@ -170,6 +170,24 @@ async function exportToZip(taskContext, branch, format, res, setHeaders = true)
meta.dataFileName = getDataFileName(note.type, note.mime, baseFileName, existingFileNames);
}
+ const ancillaries = note.getNoteAncillaries();
+
+ if (ancillaries.length > 0) {
+ meta.ancillaries = ancillaries
+ .filter(ancillary => ["canvasSvg", "mermaidSvg"].includes(ancillary.name))
+ .map(ancillary => ({
+
+ name: ancillary.name,
+ mime: ancillary.mime,
+ dataFileName: getDataFileName(
+ null,
+ ancillary.mime,
+ baseFileName + "_" + ancillary.name,
+ existingFileNames
+ )
+ }));
+ }
+
if (childBranches.length > 0) {
meta.dirFileName = getUniqueFilename(existingFileNames, baseFileName);
meta.children = [];
@@ -319,6 +337,16 @@ ${markdownContent}`;
taskContext.increaseProgressCount();
+ for (const ancillaryMeta of noteMeta.ancillaries || []) {
+ const noteAncillary = note.getNoteAncillaryByName(ancillaryMeta.name);
+ const content = noteAncillary.getContent();
+
+ archive.append(content, {
+ name: filePathPrefix + ancillaryMeta.dataFileName,
+ date: dateUtils.parseDateTime(note.utcDateModified)
+ });
+ }
+
if (noteMeta.children && noteMeta.children.length > 0) {
const directoryPath = filePathPrefix + noteMeta.dirFileName;
diff --git a/src/services/import/zip.js b/src/services/import/zip.js
index abe3b58a9..64df89e28 100644
--- a/src/services/import/zip.js
+++ b/src/services/import/zip.js
@@ -14,6 +14,7 @@ const treeService = require("../tree");
const yauzl = require("yauzl");
const htmlSanitizer = require('../html_sanitizer');
const becca = require("../../becca/becca");
+const BNoteAncillary = require("../../becca/entities/bnote_ancillary");
/**
* @param {TaskContext} taskContext
@@ -64,6 +65,7 @@ async function importZip(taskContext, fileBuffer, importRootNote) {
};
let parent;
+ let ancillaryMeta = false;
for (const segment of pathSegments) {
if (!cursor || !cursor.children || cursor.children.length === 0) {
@@ -72,11 +74,28 @@ async function importZip(taskContext, fileBuffer, importRootNote) {
parent = cursor;
cursor = parent.children.find(file => file.dataFileName === segment || file.dirFileName === segment);
+
+ if (!cursor) {
+ for (const file of parent.children) {
+ for (const ancillary of file.ancillaries || []) {
+ if (ancillary.dataFileName === segment) {
+ cursor = file;
+ ancillaryMeta = ancillary;
+ break;
+ }
+ }
+
+ if (cursor) {
+ break;
+ }
+ }
+ }
}
return {
parentNoteMeta: parent,
- noteMeta: cursor
+ noteMeta: cursor,
+ ancillaryMeta
};
}
@@ -351,7 +370,7 @@ async function importZip(taskContext, fileBuffer, importRootNote) {
}
function saveNote(filePath, content) {
- const {parentNoteMeta, noteMeta} = getMeta(filePath);
+ const {parentNoteMeta, noteMeta, ancillaryMeta} = getMeta(filePath);
if (noteMeta?.noImport) {
return;
@@ -359,6 +378,17 @@ async function importZip(taskContext, fileBuffer, importRootNote) {
const noteId = getNoteId(noteMeta, filePath);
+ if (ancillaryMeta) {
+ const noteAncillary = new BNoteAncillary({
+ noteId,
+ name: ancillaryMeta.name,
+ mime: ancillaryMeta.mime
+ });
+
+ noteAncillary.setContent(content);
+ return;
+ }
+
const parentNoteId = getParentNoteId(filePath, parentNoteMeta);
if (!parentNoteId) {
diff --git a/src/services/note_ancillaries.js b/src/services/note_ancillaries.js
new file mode 100644
index 000000000..9336b14bb
--- /dev/null
+++ b/src/services/note_ancillaries.js
@@ -0,0 +1,37 @@
+const protectedSession = require("./protected_session");
+const log = require("./log");
+
+/**
+ * @param {BNote} note
+ */
+function protectNoteAncillaries(note) {
+ for (const noteAncillary of note.getNoteAncillaries()) {
+ if (note.isProtected !== noteAncillary.isProtected) {
+ if (!protectedSession.isProtectedSessionAvailable()) {
+ log.error("Protected session is not available to fix note ancillaries.");
+
+ return;
+ }
+
+ try {
+ const content = noteAncillary.getContent();
+
+ noteAncillary.isProtected = note.isProtected;
+
+ // this will force de/encryption
+ noteAncillary.setContent(content);
+
+ noteAncillary.save();
+ }
+ catch (e) {
+ log.error(`Could not un/protect note ancillary ID = ${noteAncillary.noteAncillaryId}`);
+
+ throw e;
+ }
+ }
+ }
+}
+
+module.exports = {
+ protectNoteAncillaries
+}
diff --git a/src/services/sync.js b/src/services/sync.js
index 80adc235f..243266cf6 100644
--- a/src/services/sync.js
+++ b/src/services/sync.js
@@ -321,7 +321,7 @@ function getEntityChangeRow(entityName, entityId) {
throw new Error(`Entity ${entityName} ${entityId} not found.`);
}
- if (['note_contents', 'note_revision_contents'].includes(entityName) && entity.content !== null) {
+ if (['note_contents', 'note_revision_contents', 'note_ancillary_contents'].includes(entityName) && entity.content !== null) {
if (typeof entity.content === 'string') {
entity.content = Buffer.from(entity.content, 'UTF-8');
}
diff --git a/src/services/sync_update.js b/src/services/sync_update.js
index d650fdb0b..50fb29a0e 100644
--- a/src/services/sync_update.js
+++ b/src/services/sync_update.js
@@ -64,7 +64,7 @@ function updateNormalEntity(remoteEntityChange, remoteEntityRow, instanceId) {
|| localEntityChange.utcDateChanged < remoteEntityChange.utcDateChanged
|| 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', 'note_ancillary_contents'].includes(remoteEntityChange.entityName)) {
remoteEntityRow.content = handleContent(remoteEntityRow.content);
}
@@ -115,7 +115,9 @@ function eraseEntity(entityChange, instanceId) {
"branches",
"attributes",
"note_revisions",
- "note_revision_contents"
+ "note_revision_contents",
+ "note_ancillaries",
+ "note_ancillary_contents"
];
if (!entityNames.includes(entityName)) {
|