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

Merge remote-tracking branch 'origin/better-sqlite3'

Browse Source 
# Conflicts:
#	libraries/ckeditor/ckeditor.js
#	libraries/ckeditor/ckeditor.js.map
#	package-lock.json
#	package.json
#	src/public/app/services/utils.js
#	src/public/app/widgets/type_widgets/editable_text.js
#	src/services/utils.js
This commit is contained in:
zadam
2020-06-18 09:03:09 +02:00
parent 28dc6b93ca f745e21e0d
commit a7d9870846
57 changed files with 1384 additions and 1176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/services/import/tar.js
View File

@@ -47,7 +47,7 @@ async function importTar(taskContext, fileBuffer, importRootNote) {
return noteIdMap[origNoteId];
}
function getMeta(filePath) {
if (!metaFile) {
return {};
@@ -403,7 +403,7 @@ async function importTar(taskContext, fileBuffer, importRootNote) {
}
for (const noteId in createdNoteIds) { // now the noteIds are unique
await noteService.scanForLinks(await repository.getNotes(noteId));
await noteService.scanForLinks(await repository.getNote(noteId));
if (!metaFile) {
// if there's no meta file then the notes are created based on the order in that tar file but that
@@ -437,4 +437,4 @@ async function importTar(taskContext, fileBuffer, importRootNote) {
module.exports = {
importTar
};
};

4
src/services/import/zip.js
View File

@@ -434,7 +434,7 @@ async function importZip(taskContext, fileBuffer, importRootNote) {
});
for (const noteId in createdNoteIds) { // now the noteIds are unique
await noteService.scanForLinks(await repository.getNotes(noteId));
await noteService.scanForLinks(await repository.getNote(noteId));
if (!metaFile) {
// if there's no meta file then the notes are created based on the order in that tar file but that
@@ -461,4 +461,4 @@ async function importZip(taskContext, fileBuffer, importRootNote) {
module.exports = {
importZip
};
};