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

export with pos in filename and import so we preserve note order

Browse Source
This commit is contained in:
azivner
2017-12-03 00:10:43 -05:00
parent cd3c6d7e3b
commit ddd216c92e
2 changed files with 35 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
routes/api/import.js
View File

@@ -40,13 +40,29 @@ async function importNotes(dir, parentNoteId) {
continue;
}
const noteTitle = file.substr(0, file.length - 5);
const noteText = fs.readFileSync(path, "utf8");
const fileNameWithoutExt = file.substr(0, file.length - 5);
let maxPos = await sql.getSingleValue("SELECT MAX(note_pos) FROM notes_tree WHERE note_pid = ? AND is_deleted = 0", [parentNoteId]);
if (!maxPos) {
maxPos = 1;
let noteTitle;
let notePos;
const match = fileNameWithoutExt.match(/^([0-9]{4})-(.*)$/);
if (match) {
notePos = parseInt(match[1]);
noteTitle = match[2];
}
else {
let maxPos = await sql.getSingleValue("SELECT MAX(note_pos) FROM notes_tree WHERE note_pid = ? AND is_deleted = 0", [parentNoteId]);
if (maxPos) {
notePos = maxPos + 1;
}
else {
notePos = 0;
}
noteTitle = fileNameWithoutExt;
}
const noteText = fs.readFileSync(path, "utf8");
const noteId = utils.newNoteId();
const noteTreeId = utils.newNoteHistoryId();
@@ -55,7 +71,7 @@ async function importNotes(dir, parentNoteId) {
note_tree_id: noteTreeId,
note_id: noteId,
note_pid: parentNoteId,
note_pos: maxPos + 1,
note_pos: notePos,
is_expanded: 0,
is_deleted: 0,
date_modified: utils.nowTimestamp()
@@ -75,7 +91,7 @@ async function importNotes(dir, parentNoteId) {
await sync_table.addNoteSync(noteId);
const noteDir = dir + '/' + noteTitle;
const noteDir = dir + '/' + fileNameWithoutExt;
if (fs.existsSync(noteDir) && fs.lstatSync(noteDir).isDirectory()) {
await importNotes(noteDir, noteId);