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

#98, sync to server now works as well + a lot of related changes

Browse Source
This commit is contained in:
azivner
2018-07-24 20:35:03 +02:00
parent 013714cb5c
commit 37ab7b4641
19 changed files with 153 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/services/setup.js
View File

@@ -1,15 +1,16 @@
const sqlInit = require('./sql_init');
const sql = require('./sql');
const rp = require('request-promise');
const Option = require('../entities/option');
const syncService = require('./sync');
const log = require('./log');
const optionService = require('./options');
const sqlInit = require('./sql_init');
function triggerSync() {
// it's ok to not wait for it here
syncService.sync().then(async () => {
await optionService.setOption('initialized', 'true');
log.info("Triggering sync.");
// it's ok to not wait for it here
syncService.sync().then(async res => {
if (res.success) {
await sqlInit.dbInitialized();
}
});
}
@@ -34,17 +35,7 @@ async function setupSyncFromSyncServer(serverAddress, username, password) {
json: true
});
log.info("Creating database for sync");
await sql.transactional(async () => {
await sqlInit.createDatabaseForSync(serverAddress);
for (const opt of options) {
await new Option(opt).save();
}
});
log.info("Triggering sync.");
await sqlInit.createDatabaseForSync(options, serverAddress);
triggerSync();