sascha
/
Notes
mirror of https://github.com/TriliumNext/Notes
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

markdown import

pull/255/head
azivner 2018-09-03 12:05:44 +07:00
parent 9bdd4437f2
commit c41b809720
2 changed files with 84 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/routes/api/export.js
Unescape Escape View File

@ -92,10 +92,9 @@ async function exportToTar(branch, res) {
const pack = tar.pack();
const exportedNoteIds = [];
const name = await exportNoteInner(branch.branchId, '');
const name = await exportNoteInner(branch, '');
async function exportNoteInner(branchId, directory) {
const branch = await repository.getBranch(branchId);
async function exportNoteInner(branch, directory) {
const note = await branch.getNote();
const childFileName = directory + sanitize(note.title);
@ -138,8 +137,14 @@ async function exportToTar(branch, res) {
exportedNoteIds.push(note.noteId);
for (const child of await note.getChildBranches()) {
await exportNoteInner(child.branchId, childFileName + "/");
const childBranches = await note.getChildBranches();
if (childBranches.length > 0) {
saveDirectory(childFileName);
}
for (const childBranch of childBranches) {
await exportNoteInner(childBranch, childFileName + "/");
}
return childFileName;
@ -157,6 +162,10 @@ async function exportToTar(branch, res) {
pack.entry({name: childFileName + ".meta", size: metadataJson.length}, metadataJson);
}
function saveDirectory(childFileName) {
pack.entry({name: childFileName, type: 'directory'});
}
pack.finalize();
res.setHeader('Content-Disposition', 'file; filename="' + name + '.tar"');
@ -187,7 +196,13 @@ async function exportToMarkdown(branch, res) {
saveDataFile(childFileName, note);
for (const childNote of await note.getChildNotes()) {
const childNotes = await note.getChildNotes();
if (childNotes.length > 0) {
saveDirectory(childFileName);
}
for (const childNote of childNotes) {
await exportNoteInner(childNote, childFileName + "/");
}
@ -219,6 +234,10 @@ async function exportToMarkdown(branch, res) {
pack.entry({name: childFileName + ".md", size: markdown.length}, markdown);
}
function saveDirectory(childFileName) {
pack.entry({name: childFileName, type: 'directory'});
}
pack.finalize();
res.setHeader('Content-Disposition', 'file; filename="' + name + '.tar"');

92
src/routes/api/import.js
Unescape Escape View File

@ -1,6 +1,7 @@
"use strict";
const repository = require('../../services/repository');
const log = require('../../services/log');
const attributeService = require('../../services/attributes');
const noteService = require('../../services/notes');
const Branch = require('../../entities/branch');
@ -80,7 +81,12 @@ async function importTar(file, parentNoteId) {
const noteIdMap = {};
const attributes = [];
await importNotes(files, parentNoteId, noteIdMap, attributes);
const markdown = {
reader: new commonmark.Parser(),
writer: new commonmark.HtmlRenderer()
};
await importNotes(markdown, files, parentNoteId, noteIdMap, attributes);
// we save attributes after importing notes because we need to have all the relation
// targets already existing
@ -106,13 +112,19 @@ function getFileName(name) {
key = "data";
name = name.substr(0, name.length - 4);
}
else if (name.endsWith(".md")) {
key = "markdown";
name = name.substr(0, name.length - 3);
}
else if (name.endsWith((".meta"))) {
key = "meta";
name = name.substr(0, name.length - 5);
}
else {
throw new Error("Unknown file type in import archive: " + name);
// this is supposed to be directory
key = "data";
}
return {name, key};
}
@ -129,6 +141,7 @@ async function parseImportFile(file) {
if (!file) {
file = fileMap[name] = {
name: path.basename(name),
children: []
};
@ -177,47 +190,60 @@ async function parseImportFile(file) {
});
}
async function importNotes(files, parentNoteId, noteIdMap, attributes) {
async function importNotes(markdown, files, parentNoteId, noteIdMap, attributes) {
for (const file of files) {
if (file.meta && file.meta.version !== 1) {
throw new Error("Can't read meta data version " + file.meta.version);
}
let note;
if (file.meta && file.meta.clone) {
await new Branch({
parentNoteId: parentNoteId,
noteId: noteIdMap[file.meta.noteId],
prefix: file.meta.prefix
}).save();
if (file.markdown) {
const parsed = markdown.reader.parse(file.markdown.toString("UTF-8"));
const content = markdown.writer.render(parsed);
return;
note = (await noteService.createNote(parentNoteId, file.name, content, {
type: 'text',
mime: 'text/html'
})).note;
}
else {
if (file.meta.version !== 1) {
throw new Error("Can't read meta data version " + file.meta.version);
}
if (!file.meta || file.meta.type !== 'file') {
file.data = file.data.toString("UTF-8");
}
if (file.meta.clone) {
await new Branch({
parentNoteId: parentNoteId,
noteId: noteIdMap[file.meta.noteId],
prefix: file.meta.prefix
}).save();
const {note} = await noteService.createNote(parentNoteId, file.meta.title, file.data, {
type: file.meta.type,
mime: file.meta.mime,
prefix: file.meta.prefix
});
return;
}
noteIdMap[file.meta.noteId] = note.noteId;
for (const attribute of file.meta.attributes) {
attributes.push({
noteId: note.noteId,
type: attribute.type,
name: attribute.name,
value: attribute.value,
isInheritable: attribute.isInheritable,
position: attribute.position
});
if (file.meta.type !== 'file') {
file.data = file.data.toString("UTF-8");
}
note = (await noteService.createNote(parentNoteId, file.meta.title, file.data, {
type: file.meta.type,
mime: file.meta.mime,
prefix: file.meta.prefix
})).note;
noteIdMap[file.meta.noteId] = note.noteId;
for (const attribute of file.meta.attributes) {
attributes.push({
noteId: note.noteId,
type: attribute.type,
name: attribute.name,
value: attribute.value,
isInheritable: attribute.isInheritable,
position: attribute.position
});
}
}
if (file.children.length > 0) {
await importNotes(file.children, note.noteId, noteIdMap, attributes);
await importNotes(markdown, file.children, note.noteId, noteIdMap, attributes);
}
}
}