relaunch app after successful sync

This commit is contained in:
zadam 2019-12-28 12:55:53 +01:00
parent 05a8ffb944
commit bb8b563ece
3 changed files with 16 additions and 7 deletions

View File

@ -125,14 +125,14 @@ function FrontendScriptApi(startNote, currentNote, originEntity = null, tabConte
} }
/** /**
* Executes given anonymous function on the server. * Executes given anonymous function on the backend.
* Internally this serializes the anonymous function into string and sends it to backend via AJAX. * Internally this serializes the anonymous function into string and sends it to backend via AJAX.
* *
* @param {string} script - script to be executed on the backend * @param {string} script - script to be executed on the backend
* @param {Array.<?>} params - list of parameters to the anonymous function to be send to backend * @param {Array.<?>} params - list of parameters to the anonymous function to be send to backend
* @return {Promise<*>} return value of the executed function on the backend * @return {Promise<*>} return value of the executed function on the backend
*/ */
this.runOnServer = async (script, params = []) => { this.runOnBackend = async (script, params = []) => {
if (typeof script === "function") { if (typeof script === "function") {
script = script.toString(); script = script.toString();
} }
@ -159,6 +159,12 @@ function FrontendScriptApi(startNote, currentNote, originEntity = null, tabConte
} }
}; };
/**
* @deprecated new name of this API call is runOnBackend so use that
* @method
*/
this.runOnServer = this.runOnBackend;
/** /**
* This is a powerful search method - you can search by attributes and their values, e.g.: * This is a powerful search method - you can search by attributes and their values, e.g.:
* "@dateModified =* MONTH AND @log". See full documentation for all options at: https://github.com/zadam/trilium/wiki/Search * "@dateModified =* MONTH AND @log". See full documentation for all options at: https://github.com/zadam/trilium/wiki/Search

View File

@ -131,12 +131,15 @@ async function checkOutstandingSyncs() {
const { stats, initialized } = await $.get('api/sync/stats'); const { stats, initialized } = await $.get('api/sync/stats');
if (initialized) { if (initialized) {
window.location.replace("./"); const remote = require('electron').remote;
remote.app.relaunch();
remote.app.exit(0);
} }
else {
const totalOutstandingSyncs = stats.outstandingPushes + stats.outstandingPulls;
const totalOutstandingSyncs = stats.outstandingPushes + stats.outstandingPulls; $("#outstanding-syncs").html(totalOutstandingSyncs);
}
$("#outstanding-syncs").html(totalOutstandingSyncs);
} }
function showAlert(message) { function showAlert(message) {

View File

@ -83,7 +83,7 @@ async function checkBasicAuth(req, res, next) {
const dbUsername = await optionService.getOption('username'); const dbUsername = await optionService.getOption('username');
if (dbUsername !== username || !await passwordEncryptionService.verifyPassword(password)) { if (dbUsername !== username || !await passwordEncryptionService.verifyPassword(password)) {
res.status(401).send("Not authorized"); res.status(401).send('Incorrect username and/or password');
} }
else { else {
next(); next();