zadam/trilium
1
1
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-02-25 07:25:32 +08:00
Code Issues Projects Releases Packages Wiki Activity

simplification of script bundles on backend

Browse source
This commit is contained in:
azivner 2019-01-13 11:56:50 +01:00
parent 3d8905207e
commit f7f0560a9f
3 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/routes/api/script.js
View file

@ -53,14 +53,21 @@ async function getRelationBundles(req) {
const bundles = [];
for (const noteId of uniqueNoteIds) {
bundles.push(await scriptService.getScriptBundleForNoteId(noteId));
const note = await repository.getNote(noteId);
const bundle = await scriptService.getScriptBundle(note);
if (bundle) {
bundles.push(bundle);
}
}
return bundles;
}
async function getBundle(req) {
return await scriptService.getScriptBundleForNoteId(req.params.noteId);
const note = await repository.getNote(req.params.noteId);
return await scriptService.getScriptBundle(note);
}
module.exports = {

5
src/services/repository.js
View file

@ -47,11 +47,6 @@ async function getBranch(branchId) {
return await getEntity("SELECT * FROM branches WHERE branchId = ?", [branchId]);
}
/** @returns {Image|null} */
async function getImage(imageId) {
return await getEntity("SELECT * FROM images WHERE imageId = ?", [imageId]);
}
/** @returns {Attribute|null} */
async function getAttribute(attributeId) {
return await getEntity("SELECT * FROM attributes WHERE attributeId = ?", [attributeId]);

8
src/services/script.js
View file

@ -153,14 +153,8 @@ function sanitizeVariableName(str) {
return str.replace(/[^a-z0-9_]/gim, "");
}
async function getScriptBundleForNoteId(noteId) {
const note = await repository.getNote(noteId);
return await getScriptBundle(note);
}
module.exports = {
executeNote,
executeScript,
getScriptBundle,
getScriptBundleForNoteId
getScriptBundle
};