gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-06-05 01:18:44 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix export/import for multi-valued attributes

Browse Source
This commit is contained in:
azivner 2018-03-03 09:30:18 -05:00
parent d169f67901
commit 8c7d159012
3 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/routes/api/export.js
View File

@ -3,21 +3,22 @@
const express = require('express');
const router = express.Router();
const sql = require('../../services/sql');
const attributes = require('../../services/attributes');
const html = require('html');
const auth = require('../../services/auth');
const wrap = require('express-promise-wrap').wrap;
const tar = require('tar-stream');
const sanitize = require("sanitize-filename");
const Repository = require("../../services/repository");
router.get('/:noteId/', auth.checkApiAuthOrElectron, wrap(async (req, res, next) => {
const noteId = req.params.noteId;
const repo = new Repository(req);
const noteTreeId = await sql.getValue('SELECT noteTreeId FROM note_tree WHERE noteId = ?', [noteId]);
const pack = tar.pack();
const name = await exportNote(noteTreeId, '', pack);
const name = await exportNote(noteTreeId, '', pack, repo);
pack.finalize();
@ -27,9 +28,9 @@ router.get('/:noteId/', auth.checkApiAuthOrElectron, wrap(async (req, res, next)
pack.pipe(res);
}));
async function exportNote(noteTreeId, directory, pack) {
async function exportNote(noteTreeId, directory, pack, repo) {
const noteTree = await sql.getRow("SELECT * FROM note_tree WHERE noteTreeId = ?", [noteTreeId]);
const note = await sql.getRow("SELECT * FROM notes WHERE noteId = ?", [noteTree.noteId]);
const note = await repo.getEntity("SELECT notes.* FROM notes WHERE noteId = ?", [noteTree.noteId]);
if (note.isProtected) {
return;
@ -54,7 +55,7 @@ async function exportNote(noteTreeId, directory, pack) {
if (children.length > 0) {
for (const child of children) {
await exportNote(child.noteTreeId, childFileName + "/", pack);
await exportNote(child.noteTreeId, childFileName + "/", pack, repo);
}
}
@ -66,7 +67,12 @@ async function getMetadata(note) {
title: note.title,
type: note.type,
mime: note.mime,
attributes: await attributes.getNoteAttributeMap(note.noteId)
attributes: (await note.getAttributes()).map(attr => {
return {
name: attr.name,
value: attr.value
};
})
};
}

6
src/routes/api/import.js
View File

@ -4,6 +4,7 @@ const express = require('express');
const router = express.Router();
const sql = require('../../services/sql');
const auth = require('../../services/auth');
const attributes = require('../../services/attributes');
const notes = require('../../services/notes');
const wrap = require('express-promise-wrap').wrap;
const tar = require('tar-stream');
@ -118,10 +119,13 @@ async function importNotes(files, parentNoteId, sourceId) {
const noteId = await notes.createNote(parentNoteId, file.meta.title, file.data, {
type: file.meta.type,
mime: file.meta.mime,
attributes: file.meta.attributes,
sourceId: sourceId
});
for (const attr of file.meta.attributes) {
await attributes.createAttribute(noteId, attr.name, attr.value);
}
if (file.children.length > 0) {
await importNotes(file.children, noteId, sourceId);
}

2
src/services/attributes.js
View File

@ -62,12 +62,14 @@ async function createAttribute(noteId, name, value = "", sourceId = null) {
const now = utils.nowDate();
const attributeId = utils.newAttributeId();
const position = 1 + await sql.getValue(`SELECT COALESCE(MAX(position), 0) FROM attributes WHERE noteId = ?`, [noteId]);
await sql.insert("attributes", {
attributeId: attributeId,
noteId: noteId,
name: name,
value: value,
position: position,
dateModified: now,
dateCreated: now,
isDeleted: false