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

syncification

Browse Source
This commit is contained in:
zadam
2020-06-20 12:31:38 +02:00
parent 30062d687f
commit 88348c560c
97 changed files with 1673 additions and 1700 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/services/setup.js
View File

@@ -22,9 +22,9 @@ function triggerSync() {
log.info("Triggering sync.");
// it's ok to not wait for it here
syncService.sync().then(async res => {
syncService.sync().then(res => {
if (res.success) {
await sqlInit.dbInitialized();
sqlInit.dbInitialized();
}
});
}
@@ -33,30 +33,30 @@ async function sendSeedToSyncServer() {
log.info("Initiating sync to server");
await requestToSyncServer('POST', '/api/setup/sync-seed', {
options: await getSyncSeedOptions(),
options: getSyncSeedOptions(),
syncVersion: appInfo.syncVersion
});
// this is completely new sync, need to reset counters. If this would not be new sync,
// the previous request would have failed.
await optionService.setOption('lastSyncedPush', 0);
await optionService.setOption('lastSyncedPull', 0);
optionService.setOption('lastSyncedPush', 0);
optionService.setOption('lastSyncedPull', 0);
}
async function requestToSyncServer(method, path, body = null) {
const timeout = await syncOptions.getSyncTimeout();
const timeout = syncOptions.getSyncTimeout();
return utils.timeLimit(request.exec({
return await utils.timeLimit(request.exec({
method,
url: await syncOptions.getSyncServerHost() + path,
url: syncOptions.getSyncServerHost() + path,
body,
proxy: await syncOptions.getSyncProxy(),
proxy: syncOptions.getSyncProxy(),
timeout: timeout
}), timeout);
}
async function setupSyncFromSyncServer(syncServerHost, syncProxy, username, password) {
if (await sqlInit.isDbInitialized()) {
if (sqlInit.isDbInitialized()) {
return {
result: 'failure',
error: 'DB is already initialized.'
@@ -89,7 +89,7 @@ async function setupSyncFromSyncServer(syncServerHost, syncProxy, username, pass
}
}
await sqlInit.createDatabaseForSync(resp.options, syncServerHost, syncProxy);
sqlInit.createDatabaseForSync(resp.options, syncServerHost, syncProxy);
triggerSync();
@@ -105,10 +105,10 @@ async function setupSyncFromSyncServer(syncServerHost, syncProxy, username, pass
}
}
async function getSyncSeedOptions() {
function getSyncSeedOptions() {
return [
await repository.getOption('documentId'),
await repository.getOption('documentSecret')
repository.getOption('documentId'),
repository.getOption('documentSecret')
];
}