release 0.45.8

new env variable to specify start note, #1532
use correct class in exported HTMLs so that content style is applied, #1504
2025-10-29 09:16:45 +01:00 · 2021-01-11 22:29:31 +01:00 · 2021-01-11 22:29:02 +01:00 · 2020-12-30 23:20:12 +01:00 · 2020-12-25 20:46:04 +01:00 · 2020-12-25 13:01:35 +01:00
8 changed files with 39 additions and 32 deletions
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
  "name": "trilium",
  "productName": "Trilium Notes",
  "description": "Trilium Notes",
-  "version": "0.45.7",
+  "version": "0.45.8",
  "license": "AGPL-3.0-only",
  "main": "electron.js",
  "bin": {
--- a/src/public/app/widgets/type_widgets/editable_text.js
+++ b/src/public/app/widgets/type_widgets/editable_text.js
@@ -38,7 +38,7 @@ const TPL = `
        cursor: text !important;
    }
    
-    .note-detail-editable-text *:first-child {
+    .note-detail-editable-text *:not(figure):first-child {
        margin-top: 0 !important;
    }
    
--- a/src/routes/api/export.js
+++ b/src/routes/api/export.js
@@ -23,11 +23,7 @@ function exportBranch(req, res) {

    try {
        if (type === 'subtree' && (format === 'html' || format === 'markdown')) {
-            const start = Date.now();
-
            zipExportService.exportToZip(taskContext, branch, format, res);
-
-            console.log("Export took", Date.now() - start, "ms");
        }
        else if (type === 'single') {
            singleExportService.exportSingleNote(taskContext, branch, format, res);
--- a/src/services/build.js
+++ b/src/services/build.js
@@ -1 +1 @@
-module.exports = { buildDate:"2020-12-22T20:21:15+01:00", buildRevision: "bdfd760b9d428dc29c45a0e016d12a25af220043" };
+module.exports = { buildDate:"2021-01-11T22:29:31+01:00", buildRevision: "369274ead75947a68bf7bbb5ab1e784e81521030" };
--- a/src/services/export/zip.js
+++ b/src/services/export/zip.js
@@ -143,7 +143,7 @@ function exportToZip(taskContext, branch, format, res) {
        const available = !note.isProtected || protectedSessionService.isProtectedSessionAvailable();

        // if it's a leaf then we'll export it even if it's empty
-        if (available && ((note.getContent()).length > 0 || childBranches.length === 0)) {
+        if (available && (note.getContent().length > 0 || childBranches.length === 0)) {
            meta.dataFileName = getDataFileName(note, baseFileName, existingFileNames);
        }

@@ -234,7 +234,7 @@ function exportToZip(taskContext, branch, format, res) {
    <link rel="stylesheet" href="${cssUrl}">
    <base target="_parent">
 </head>
-<body>
+<body class="ck-content">
  <h1>${utils.escapeHtml(title)}</h1>
 ${content}
 </body>
@@ -433,14 +433,13 @@ ${content}
    }

    const note = branch.getNote();
-    const zipFileName = (branch.prefix ? (branch.prefix + " - ") : "") + note.title + ".zip";
+    const zipFileName = (branch.prefix ? `${branch.prefix} - ` : "") + note.title + ".zip";

    res.setHeader('Content-Disposition', utils.getContentDisposition(zipFileName));
    res.setHeader('Content-Type', 'application/zip');

-    zipFile.end();
-
    zipFile.outputStream.pipe(res);
+    zipFile.end();

    taskContext.taskSucceeded();
 }
--- a/src/services/options_init.js
+++ b/src/services/options_init.js
@@ -31,10 +31,7 @@ function initNotSyncedOptions(initialized, startNotePath = 'root', opts = {}) {
    optionService.createOption('openTabs', JSON.stringify([
        {
            notePath: startNotePath,
-            active: true,
-            sidebar: {
-                widgets: []
-            }
+            active: true
        }
    ]), false);

@@ -103,6 +100,15 @@ function initStartupOptions() {
            log.info(`Created missing option "${name}" with default value "${value}"`);
        }
    }
+
+    if (process.env.TRILIUM_START_NOTE_ID) {
+        optionService.setOption('openTabs', JSON.stringify([
+            {
+                notePath: process.env.TRILIUM_START_NOTE_ID,
+                active: true
+            }
+        ]));
+    }
 }

 function getKeyboardDefaultOptions() {
--- a/src/services/search/expressions/note_content_protected_fulltext.js
+++ b/src/services/search/expressions/note_content_protected_fulltext.js
@@ -32,26 +32,29 @@ class NoteContentProtectedFulltextExp extends Expression {
                FROM notes JOIN note_contents USING (noteId) 
                WHERE type IN ('text', 'code') AND isDeleted = 0 AND isProtected = 1`)) {

+            if (!inputNoteSet.hasNoteId(noteId) || !(noteId in noteCache.notes)) {
+                continue;
+            }
+
            try {
                content = protectedSessionService.decryptString(content);
            }
            catch (e) {
-                log.info('Cannot decrypt content of note', noteId);
+                log.info(`Cannot decrypt content of note ${noteId}`);
                continue;
            }

            content = content.toLowerCase();

            if (type === 'text' && mime === 'text/html') {
-                content = striptags(content);
+                if (content.length < 20000) { // striptags is slow for very large notes
+                    content = striptags(content);
+                }
+
                content = content.replace(/&nbsp;/g, ' ');
            }

-            if (this.tokens.find(token => !content.includes(token))) {
-                continue;
-            }
-
-            if (inputNoteSet.hasNoteId(noteId) && noteId in noteCache.notes) {
+            if (!this.tokens.find(token => !content.includes(token))) {
                resultNoteSet.add(noteCache.notes[noteId]);
            }
        }
--- a/src/services/search/expressions/note_content_unprotected_fulltext.js
+++ b/src/services/search/expressions/note_content_unprotected_fulltext.js
@@ -26,18 +26,21 @@ class NoteContentUnprotectedFulltextExp extends Expression {
                FROM notes JOIN note_contents USING (noteId) 
                WHERE type IN ('text', 'code') AND isDeleted = 0 AND isProtected = 0`)) {

-            content = content.toString().toLowerCase();
-
-            if (type === 'text' && mime === 'text/html') {
-                content = striptags(content);
-                content = content.replace(/&nbsp;/g, ' ');
-            }
-
-            if (this.tokens.find(token => !content.includes(token))) {
+            if (!inputNoteSet.hasNoteId(noteId) || !(noteId in noteCache.notes)) {
                continue;
            }

-            if (inputNoteSet.hasNoteId(noteId) && noteId in noteCache.notes) {
+            content = content.toString().toLowerCase();
+
+            if (type === 'text' && mime === 'text/html') {
+                if (content.length < 20000) { // striptags is slow for very large notes
+                    content = striptags(content);
+                }
+
+                content = content.replace(/&nbsp;/g, ' ');
+            }
+
+            if (!this.tokens.find(token => !content.includes(token))) {
                resultNoteSet.add(noteCache.notes[noteId]);
            }
        }
Author	SHA1	Message	Date
zadam	6afc299efb	release 0.45.8	2021-01-11 22:29:31 +01:00
zadam	369274ead7	new env variable to specify start note, #1532	2021-01-11 22:29:02 +01:00
zadam	04e6431c09	use correct class in exported HTMLs so that content style is applied, #1504	2020-12-30 23:20:12 +01:00
zadam	e89057a771	search note content only if not excluded by other expressions	2020-12-25 20:46:04 +01:00
zadam	4f27254e64	fix top margin of images and tables which can obscure their handles	2020-12-25 13:01:35 +01:00
zadam	577dc95ab8	convert   into whitespace also for large notes	2020-12-25 12:55:16 +01:00
zadam	a266d6a3d5	don't strip tags for very large text notes, #1500	2020-12-24 23:37:21 +01:00
zadam	749b6cb57e	don't strip tags for very large text notes, #1500	2020-12-24 23:33:42 +01:00
zadam	b0b2951ff6	cleanup	2020-12-22 22:30:04 +01:00