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

fixed initial demo import

Browse Source
This commit is contained in:
zadam
2020-07-02 21:08:18 +02:00
parent ef847b9904
commit c4cc48dfc9
5 changed files with 27 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/services/sql_init.js
View File

@@ -55,7 +55,7 @@ function initDbConnection() {
dbReady.resolve();
}
function createInitialDatabase(username, password, theme) {
async function createInitialDatabase(username, password, theme) {
log.info("Creating initial database ...");
if (isDbInitialized()) {
@@ -65,13 +65,15 @@ function createInitialDatabase(username, password, theme) {
const schema = fs.readFileSync(resourceDir.DB_INIT_DIR + '/schema.sql', 'UTF-8');
const demoFile = fs.readFileSync(resourceDir.DB_INIT_DIR + '/demo.zip');
let rootNote;
sql.transactional(() => {
sql.executeScript(schema);
const Note = require("../entities/note");
const Branch = require("../entities/branch");
const rootNote = new Note({
rootNote = new Note({
noteId: 'root',
title: 'root',
type: 'text',
@@ -87,12 +89,16 @@ function createInitialDatabase(username, password, theme) {
isExpanded: true,
notePosition: 10
}).save();
});
const dummyTaskContext = new TaskContext("1", 'import', false);
const dummyTaskContext = new TaskContext("initial-demo-import", 'import', false);
const zipImportService = require("./import/zip");
zipImportService.importZip(dummyTaskContext, demoFile, rootNote);
const zipImportService = require("./import/zip");
await zipImportService.importZip(dummyTaskContext, demoFile, rootNote);
require('./sync_table').fillAllSyncRows();
sql.transactional(() => {
const startNoteId = sql.getValue("SELECT noteId FROM branches WHERE parentNoteId = 'root' AND isDeleted = 0 ORDER BY notePosition");
const optionsInitService = require('./options_init');
@@ -100,8 +106,6 @@ function createInitialDatabase(username, password, theme) {
optionsInitService.initDocumentOptions();
optionsInitService.initSyncedOptions(username, password);
optionsInitService.initNotSyncedOptions(true, startNoteId, { theme });
require('./sync_table').fillAllSyncRows();
});
log.info("Schema and initial content generated.");