gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-03-01 14:22:32 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix import

Browse Source
This commit is contained in:
zadam 2020-06-07 23:55:55 +02:00
parent b3e66d5a83
commit e70c862e72
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/services/backup.js
View File

@ -110,8 +110,10 @@ async function anonymize() {
await db.run(`UPDATE attributes SET name = 'name' WHERE type = 'relation' AND name NOT IN (${builtinAttrs})`); await db.run(`UPDATE attributes SET name = 'name' WHERE type = 'relation' AND name NOT IN (${builtinAttrs})`);
await db.run("UPDATE branches SET prefix = 'prefix' WHERE prefix IS NOT NULL"); await db.run("UPDATE branches SET prefix = 'prefix' WHERE prefix IS NOT NULL");
await db.run(`UPDATE options SET value = 'anonymized' WHERE name IN await db.run(`UPDATE options SET value = 'anonymized' WHERE name IN
('documentId', 'documentSecret', 'encryptedDataKey', 'passwordVerificationHash', ('documentId', 'documentSecret', 'encryptedDataKey',
'passwordVerificationSalt', 'passwordDerivedKeySalt', 'username', 'syncServerHost', 'syncProxy')`); 'passwordVerificationHash', 'passwordVerificationSalt',
'passwordDerivedKeySalt', 'username', 'syncServerHost', 'syncProxy')
AND value != ''`);
await db.run("VACUUM"); await db.run("VACUUM");
await db.close(); await db.close();

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

@ -47,7 +47,7 @@ async function importTar(taskContext, fileBuffer, importRootNote) {
return noteIdMap[origNoteId]; return noteIdMap[origNoteId];
} }
function getMeta(filePath) { function getMeta(filePath) {
if (!metaFile) { if (!metaFile) {
return {}; return {};
@ -425,7 +425,7 @@ async function importTar(taskContext, fileBuffer, importRootNote) {
} }
for (const noteId in createdNoteIds) { // now the noteIds are unique 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 (!metaFile) {
// if there's no meta file then the notes are created based on the order in that tar file but that // if there's no meta file then the notes are created based on the order in that tar file but that
@ -459,4 +459,4 @@ async function importTar(taskContext, fileBuffer, importRootNote) {
module.exports = { module.exports = {
importTar importTar
}; };

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

@ -454,7 +454,7 @@ async function importZip(taskContext, fileBuffer, importRootNote) {
}); });
for (const noteId in createdNoteIds) { // now the noteIds are unique 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 (!metaFile) {
// if there's no meta file then the notes are created based on the order in that tar file but that // if there's no meta file then the notes are created based on the order in that tar file but that
@ -481,4 +481,4 @@ async function importZip(taskContext, fileBuffer, importRootNote) {
module.exports = { module.exports = {
importZip importZip
}; };