zip import refactoring

src/services/help_import.js

@@ -1,20 +1,18 @@
-const sqlInit = require("./sql_init");
 const cls = require("./cls");
 const zipImport = require("../services/import/zip");
 const TaskContext = require("./task_context");
 const becca = require("../becca/becca");
+const beccaLoader = require("../becca/becca_loader");
 const fs = require("fs").promises;
 
 const HELP_FILE_PATH = '/home/adam/Downloads/Help1.zip';
 
-sqlInit.dbReady.then(() => {
+beccaLoader.beccaLoaded.then(() => {
     cls.init(async () => {
         const helpRoot = becca.getNote("_help");
         const taskContext = new TaskContext('no-progress-reporting', null, {});
         const data = await fs.readFile(HELP_FILE_PATH, "binary");
 
-        console.log("BUGGER LENGTH", data.length);
-
         await zipImport.importZip(taskContext, Buffer.from(data, 'binary'), helpRoot);
     });
 });

src/services/import/zip.js

@@ -235,51 +235,7 @@ async function importZip(taskContext, fileBuffer, importRootNote) {
         return targetNoteId;
     }
 
-    function saveNote(filePath, content) {
+    function processNoteContent(content, noteTitle, filePath, noteMeta) {
-        const {parentNoteMeta, noteMeta} = getMeta(filePath);
-
-        if (noteMeta && noteMeta.noImport) {
-            return;
-        }
-
-        const noteId = getNoteId(noteMeta, filePath);
-        const parentNoteId = getParentNoteId(filePath, parentNoteMeta);
-
-        if (!parentNoteId) {
-            throw new Error(`Cannot find parentNoteId for ${filePath}`);
-        }
-
-        if (noteMeta && noteMeta.isClone) {
-            if (!becca.getBranchFromChildAndParent(noteId, parentNoteId)) {
-                new Branch({
-                    noteId,
-                    parentNoteId,
-                    isExpanded: noteMeta.isExpanded,
-                    prefix: noteMeta.prefix,
-                    notePosition: noteMeta.notePosition
-                }).save();
-            }
-
-            return;
-        }
-
-        let {type, mime} = noteMeta ? noteMeta : detectFileTypeAndMime(taskContext, filePath);
-
-        if (type !== 'file' && type !== 'image') {
-            content = content.toString("UTF-8");
-        }
-
-        type = resolveNoteType(type);
-
-        if ((noteMeta && noteMeta.format === 'markdown')
-            || (!noteMeta && taskContext.data.textImportedAsText && ['text/markdown', 'text/x-markdown'].includes(mime))) {
-            const parsed = mdReader.parse(content);
-            content = mdWriter.render(parsed);
-        }
-
-        const noteTitle = utils.getNoteTitle(filePath, taskContext.data.replaceUnderscoresWithSpaces, noteMeta);
-
-        if (type === 'text') {
         function isUrlAbsolute(url) {
             return /^(?:[a-z]+:)?\/\//i.test(url);
         }
@@ -287,8 +243,7 @@ async function importZip(taskContext, fileBuffer, importRootNote) {
         content = content.replace(/<h1>([^<]*)<\/h1>/gi, (match, text) => {
             if (noteTitle.trim() === text.trim()) {
                 return ""; // remove whole H1 tag
-                }
+            } else {
-                else {
                 return `<h2>${text}</h2>`;
             }
         });
@@ -355,6 +310,55 @@ async function importZip(taskContext, fileBuffer, importRootNote) {
                 content = content.replace(new RegExp(link.value, "g"), getNewNoteId(link.value));
             }
         }
+        return content;
+    }
+
+    function saveNote(filePath, content) {
+        const {parentNoteMeta, noteMeta} = getMeta(filePath);
+
+        if (noteMeta && noteMeta.noImport) {
+            return;
+        }
+
+        const noteId = getNoteId(noteMeta, filePath);
+        const parentNoteId = getParentNoteId(filePath, parentNoteMeta);
+
+        if (!parentNoteId) {
+            throw new Error(`Cannot find parentNoteId for ${filePath}`);
+        }
+
+        if (noteMeta && noteMeta.isClone) {
+            if (!becca.getBranchFromChildAndParent(noteId, parentNoteId)) {
+                new Branch({
+                    noteId,
+                    parentNoteId,
+                    isExpanded: noteMeta.isExpanded,
+                    prefix: noteMeta.prefix,
+                    notePosition: noteMeta.notePosition
+                }).save();
+            }
+
+            return;
+        }
+
+        let {type, mime} = noteMeta ? noteMeta : detectFileTypeAndMime(taskContext, filePath);
+
+        if (type !== 'file' && type !== 'image') {
+            content = content.toString("UTF-8");
+        }
+
+        type = resolveNoteType(type);
+
+        if ((noteMeta && noteMeta.format === 'markdown')
+            || (!noteMeta && taskContext.data.textImportedAsText && ['text/markdown', 'text/x-markdown'].includes(mime))) {
+            const parsed = mdReader.parse(content);
+            content = mdWriter.render(parsed);
+        }
+
+        const noteTitle = utils.getNoteTitle(filePath, taskContext.data.replaceUnderscoresWithSpaces, noteMeta);
+
+        if (type === 'text') {
+            content = processNoteContent(content, noteTitle, filePath, noteMeta);
         }
 
         if (type === 'relationMap' && noteMeta) {
@@ -368,17 +372,6 @@ async function importZip(taskContext, fileBuffer, importRootNote) {
             }
         }
 
-        if (type === 'text' && noteMeta) {
-            const includeNoteLinks = (noteMeta.attributes || [])
-                .filter(attr => attr.type === 'relation' && attr.name === 'includeNoteLink');
-
-            // this will replace relation map links
-            for (const link of includeNoteLinks) {
-                // no need to escape the regexp find string since it's a noteId which doesn't contain any special characters
-                content = content.replace(new RegExp(link.value, "g"), getNewNoteId(link.value));
-            }
-        }
-
         let note = becca.getNote(noteId);
 
         const isProtected = importRootNote.isProtected && protectedSessionService.isProtectedSessionAvailable();
@@ -523,7 +516,7 @@ async function importZip(taskContext, fileBuffer, importRootNote) {
 
         if (!metaFile) {
             // if there's no meta file then the notes are created based on the order in that zip file but that
-            // is usually quite random so we sort the notes in the way they would appear in the file manager
+            // is usually quite random, so we sort the notes in the way they would appear in the file manager
             treeService.sortNotes(noteId, 'title', false, true);
         }
 
@@ -533,11 +526,11 @@ async function importZip(taskContext, fileBuffer, importRootNote) {
     // we're saving attributes and links only now so that all relation and link target notes
     // are already in the database (we don't want to have "broken" relations, not even transitionally)
     for (const attr of attributes) {
-        if (attr.type !== 'relation' || attr.value in createdNoteIds) {
+        if (attr.type !== 'relation' || attr.value in becca.notes) {
             new Attribute(attr).save();
         }
         else {
-            log.info(`Relation not imported since target note doesn't exist: ${JSON.stringify(attr)}`);
+            log.info(`Relation not imported since the target note doesn't exist: ${JSON.stringify(attr)}`);
         }
     }