Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-31 18:36:30 +01:00
Code Issues Packages Projects Releases Activity

Merge remote-tracking branch 'origin/stable' into redesign

Browse Source
This commit is contained in:
zadam
2021-06-01 23:33:07 +02:00
parent af62b07d5b 56378cd0f5
commit 4c64bd852e
3 changed files with 36 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/services/sql_init.js
View File

@@ -46,7 +46,7 @@ async function initDbConnection() {
}
async function createInitialDatabase(username, password, theme) {
log.info("Creating initial database ...");
log.info("Creating database schema ...");
if (isDbInitialized()) {
throw new Error("DB is already initialized");
@@ -57,6 +57,8 @@ async function createInitialDatabase(username, password, theme) {
let rootNote;
log.info("Creating root note ...");
sql.transactional(() => {
sql.executeScript(schema);
@@ -81,21 +83,36 @@ async function createInitialDatabase(username, password, theme) {
isExpanded: true,
notePosition: 10
}).save();
const optionsInitService = require('./options_init');
optionsInitService.initDocumentOptions();
optionsInitService.initSyncedOptions(username, password);
optionsInitService.initNotSyncedOptions(true, { theme });
optionsInitService.initStartupOptions();
});
log.info("Importing demo content ...");
const dummyTaskContext = new TaskContext("initial-demo-import", 'import', false);
const zipImportService = require("./import/zip");
await zipImportService.importZip(dummyTaskContext, demoFile, rootNote);
sql.transactional(() => {
// this needs to happen after ZIP import
// previous solution was to move option initialization here but then the important parts of initialization
// are not all in one transaction (because ZIP import is async and thus not transactional)
const startNoteId = sql.getValue("SELECT noteId FROM branches WHERE parentNoteId = 'root' AND isDeleted = 0 ORDER BY notePosition");
const optionsInitService = require('./options_init');
optionsInitService.initDocumentOptions();
optionsInitService.initSyncedOptions(username, password);
optionsInitService.initNotSyncedOptions(true, startNoteId, { theme });
const optionService = require("./options");
optionService.setOption('openTabs', JSON.stringify([
{
notePath: startNoteId,
active: true
}
]));
});
log.info("Schema and initial content generated.");
@@ -115,7 +132,7 @@ function createDatabaseForSync(options, syncServerHost = '', syncProxy = '') {
sql.transactional(() => {
sql.executeScript(schema);
require('./options_init').initNotSyncedOptions(false, 'root', { syncServerHost, syncProxy });
require('./options_init').initNotSyncedOptions(false, { syncServerHost, syncProxy });
// document options required for sync to kick off
for (const opt of options) {