From e257634ccff44110bfc667fe1a803ed54706518c Mon Sep 17 00:00:00 2001
From: zadam <zadam.apps@gmail.com>
Date: Sun, 2 May 2021 22:47:57 +0200
Subject: [PATCH] becca conversion WIP

---
 db/TODO.txt                              | 1 +
 src/routes/api/sync.js                   | 2 +-
 src/services/becca/entities/attribute.js | 3 ++-
 src/services/import/zip.js               | 1 +
 src/services/sql_init.js                 | 9 ++++++---
 5 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/db/TODO.txt b/db/TODO.txt
index b5c7b8e1a..f037c05ef 100644
--- a/db/TODO.txt
+++ b/db/TODO.txt
@@ -1,2 +1,3 @@
 - drop branches.utcDateCreated - not used for anything
 - drop options.utcDateCreated - not used for anything
+- isDeleted = 0 by default
diff --git a/src/routes/api/sync.js b/src/routes/api/sync.js
index 43bbdb656..909c45790 100644
--- a/src/routes/api/sync.js
+++ b/src/routes/api/sync.js
@@ -42,7 +42,7 @@ function getStats() {
     }
 
     const stats = {
-        initialized: optionService.getOption('initialized') === 'true',
+        initialized: sql.getValue("SELECT value FROM options WHERE name = 'initialized'") === 'true',
         outstandingPullCount: syncService.getOutstandingPullCount()
     };
 
diff --git a/src/services/becca/entities/attribute.js b/src/services/becca/entities/attribute.js
index 4cd65090c..14eb6c606 100644
--- a/src/services/becca/entities/attribute.js
+++ b/src/services/becca/entities/attribute.js
@@ -120,7 +120,8 @@ class Attribute extends AbstractEntity {
             position: this.position,
             value: this.value,
             isInheritable: this.isInheritable,
-            utcDateModified: dateUtils.utcNowDateTime()
+            utcDateModified: dateUtils.utcNowDateTime(),
+            isDeleted: false
         };
     }
 
diff --git a/src/services/import/zip.js b/src/services/import/zip.js
index 2ae54ce92..7c2726d9e 100644
--- a/src/services/import/zip.js
+++ b/src/services/import/zip.js
@@ -13,6 +13,7 @@ const mimeService = require("./mime");
 const treeService = require("../tree");
 const yauzl = require("yauzl");
 const htmlSanitizer = require('../html_sanitizer');
+const becca = require("../becca/becca.js");
 
 /**
  * @param {TaskContext} taskContext
diff --git a/src/services/sql_init.js b/src/services/sql_init.js
index 279c3b05f..26ac6c416 100644
--- a/src/services/sql_init.js
+++ b/src/services/sql_init.js
@@ -32,7 +32,8 @@ function isDbInitialized() {
 
 async function initDbConnection() {
     if (!isDbInitialized()) {
-        log.info(`DB not initialized, please visit setup page` + (utils.isElectron() ? '' : ` - http://[your-server-host]:${await port} to see instructions on how to initialize Trilium.`));
+        log.info(`DB not initialized, please visit setup page` +
+            (utils.isElectron() ? '' : ` - http://[your-server-host]:${await port} to see instructions on how to initialize Trilium.`));
 
         return;
     }
@@ -59,8 +60,10 @@ async function createInitialDatabase(username, password, theme) {
     sql.transactional(() => {
         sql.executeScript(schema);
 
-        const Note = require("../entities/note");
-        const Branch = require("../entities/branch");
+        require("./becca/becca_loader").load();
+
+        const Note = require("./becca/entities/note");
+        const Branch = require("./becca/entities/branch");
 
         rootNote = new Note({
             noteId: 'root',