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

support of including JS subnotes when executing

Browse Source
This commit is contained in:
azivner
2018-01-23 22:53:27 -05:00
parent 6f79a1c05b
commit 4ed2dc9f53
2 changed files with 49 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
public/javascripts/note_editor.js
View File

@@ -198,9 +198,11 @@ const noteEditor = (function() {
async function executeScript() { async function executeScript() {
if (getCurrentNoteType() === 'code') { if (getCurrentNoteType() === 'code') {
// we take script value directly from editor so we don't need to wait for it to be saved
const script = codeEditor.getValue(); const script = codeEditor.getValue();
const subTreeScripts = await server.get('script/subtree/' + getCurrentNoteId());
eval("(async function() {" + script + "})()"); eval("(async function() {" + subTreeScripts + script + "})()");
} }
} }

46
routes/api/script.js
View File

@@ -5,6 +5,9 @@ const router = express.Router();
const auth = require('../../services/auth'); const auth = require('../../services/auth');
const wrap = require('express-promise-wrap').wrap; const wrap = require('express-promise-wrap').wrap;
const log = require('../../services/log'); const log = require('../../services/log');
const sql = require('../../services/sql');
const protected_session = require('../../services/protected_session');
const data_encryption = require('../../services/data_encryption');
router.post('/exec', auth.checkApiAuth, wrap(async (req, res, next) => { router.post('/exec', auth.checkApiAuth, wrap(async (req, res, next) => {
log.info('Executing script: ' + req.body.script); log.info('Executing script: ' + req.body.script);
@@ -16,4 +19,47 @@ router.post('/exec', auth.checkApiAuth, wrap(async (req, res, next) => {
res.send(ret); res.send(ret);
})); }));
router.get('/subtree/:noteId', auth.checkApiAuth, wrap(async (req, res, next) => {
const noteId = req.params.noteId;
const dataKey = protected_session.getDataKey(req);
res.send(await getSubTreeScripts(noteId, [noteId], dataKey));
}));
async function getSubTreeScripts(parentId, includedNoteIds, dataKey) {
const childs = await sql.getAll(`SELECT notes.note_id, notes.note_title, notes.note_text, notes.is_protected
FROM notes JOIN notes_tree USING(note_id)
WHERE notes_tree.is_deleted = 0 AND notes.is_deleted = 0
AND notes_tree.parent_note_id = ? AND notes.type = 'code'
AND notes.mime = 'application/javascript'`, [parentId]);
let script = "\r\n";
for (const child of childs) {
if (includedNoteIds.includes(child.note_id)) {
return;
}
includedNoteIds.push(child.note_id);
script += await getSubTreeScripts(child.note_id, includedNoteIds, dataKey);
if (child.is_protected) {
if (!dataKey) {
throw new Error("Protected note is included, but script isn't running in protected session.");
}
child.note_title = data_encryption.decryptString(dataKey, data_encryption.noteTitleIv(child.note_id), child.note_title);
child.note_text = data_encryption.decryptString(dataKey, data_encryption.noteTextIv(child.note_id), child.note_text);
}
script += '// start of script ' + child.note_title + '\r\n';
script += child.note_text + "\r\n";
script += '// end of script ' + child.note_title + '\r\n\r\n';
}
return script;
}
module.exports = router; module.exports = router;