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

#98, sync setup now doesn't copy the whole DB file, but sets up minimal database and starts off sync

Browse Source
This commit is contained in:
azivner
2018-07-23 21:15:32 +02:00
parent a06618d851
commit 1fe7c62f5a
12 changed files with 185 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/services/sql_init.js
View File

@@ -12,9 +12,13 @@ async function createConnection() {
}
let dbReadyResolve = null;
const dbReady = new Promise((resolve, reject) => {
const dbReady = new Promise(async (resolve, reject) => {
dbReadyResolve = resolve;
// no need to create new connection now since DB stays the same all the time
const db = await createConnection();
sql.setDbConnection(db);
initDbConnection();
});
@@ -26,9 +30,6 @@ async function isDbInitialized() {
async function initDbConnection() {
await cls.init(async () => {
const db = await createConnection();
sql.setDbConnection(db);
await sql.execute("PRAGMA foreign_keys = ON");
if (!await isDbInitialized()) {
@@ -45,12 +46,12 @@ async function initDbConnection() {
}
log.info("DB ready.");
dbReadyResolve(db);
dbReadyResolve();
});
}
async function createInitialDatabase(username, password) {
log.info("Connected to db, but schema doesn't exist. Initializing schema ...");
log.info("Creating initial database ...");
const schema = fs.readFileSync(resourceDir.DB_INIT_DIR + '/schema.sql', 'UTF-8');
const notesSql = fs.readFileSync(resourceDir.DB_INIT_DIR + '/main_notes.sql', 'UTF-8');
@@ -67,15 +68,34 @@ async function createInitialDatabase(username, password) {
const startNoteId = await sql.getValue("SELECT noteId FROM branches WHERE parentNoteId = 'root' AND isDeleted = 0 ORDER BY notePosition");
await require('./options_init').initOptions(startNoteId, username, password);
const optionsInitService = require('./options_init');
await optionsInitService.initDocumentOptions();
await optionsInitService.initSyncedOptions(username, password);
await optionsInitService.initNotSyncedOptions(startNoteId);
await require('./sync_table').fillAllSyncRows();
});
log.info("Schema and initial content generated. Waiting for user to enter username/password to finish setup.");
log.info("Schema and initial content generated.");
await initDbConnection();
}
async function createDatabaseForSync(syncServerHost) {
log.info("Creating database for sync with server ...");
const schema = fs.readFileSync(resourceDir.DB_INIT_DIR + '/schema.sql', 'UTF-8');
await sql.transactional(async () => {
await sql.executeScript(schema);
await require('./options_init').initNotSyncedOptions('', syncServerHost);
});
log.info("Schema and not synced options generated.");
}
async function isDbUpToDate() {
const dbVersion = parseInt(await sql.getValue("SELECT value FROM options WHERE name = 'dbVersion'"));
@@ -93,5 +113,6 @@ module.exports = {
isDbInitialized,
initDbConnection,
isDbUpToDate,
createInitialDatabase
createInitialDatabase,
createDatabaseForSync
};