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

wip

Browse Source
This commit is contained in:
zadam
2020-06-27 00:40:35 +02:00
parent dd62b306fd
commit c778e87683
8 changed files with 44 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,7 +21,7 @@ const yauzl = require("yauzl");
* @param {Note} importRootNote
* @return {Promise<*>}
*/
function importZip(taskContext, fileBuffer, importRootNote) {
async function importZip(taskContext, fileBuffer, importRootNote) {
// maps from original noteId (in tar file) to newly generated noteId
const noteIdMap = {};
const attributes = [];
@@ -133,6 +133,15 @@ function importZip(taskContext, fileBuffer, importRootNote) {
for (const attr of noteMeta.attributes) {
attr.noteId = note.noteId;
if (attr.type === 'label-definition') {
attr.type = 'label';
attr.name = 'label:' + attr.name;
}
else if (attr.type === 'relation-definition') {
attr.type = 'label';
attr.name = 'relation:' + attr.name;
}
if (!attributeService.isAttributeType(attr.type)) {
log.error("Unrecognized attribute type " + attr.type);
continue;
@@ -405,11 +414,11 @@ function importZip(taskContext, fileBuffer, importRootNote) {
// we're running two passes to make sure that the meta file is loaded before the rest of the files is processed.
readZipFile(fileBuffer, (zipfile, entry) => {
await readZipFile(fileBuffer, async (zipfile, entry) => {
const filePath = normalizeFilePath(entry.fileName);
if (filePath === '!!!meta.json') {
const content = readContent(zipfile, entry);
const content = await readContent(zipfile, entry);
metaFile = JSON.parse(content.toString("UTF-8"));
}
@@ -417,14 +426,14 @@ function importZip(taskContext, fileBuffer, importRootNote) {
zipfile.readEntry();
});
readZipFile(fileBuffer, (zipfile, entry) => {
await readZipFile(fileBuffer, async (zipfile, entry) => {
const filePath = normalizeFilePath(entry.fileName);
if (/\/$/.test(entry.fileName)) {
saveDirectory(filePath);
}
else if (filePath !== '!!!meta.json') {
const content = readContent(zipfile, entry);
const content = await readContent(zipfile, entry);
saveNote(filePath, content);
}