gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-06-06 09:58:32 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

cleanup of status code

Browse Source
This commit is contained in:
azivner 2017-11-25 18:38:29 -05:00
parent cb31e0acf2
commit 8766e9ae4a
4 changed files with 0 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
public/javascripts/status.js
View File

@ -1,49 +0,0 @@
"use strict";
const status = (function() {
const changesToPushCountEl = $("#changesToPushCount");
async function checkStatus() {
const resp = await $.ajax({
url: baseApiUrl + 'status',
type: 'POST',
contentType: "application/json",
data: JSON.stringify({
treeLoadTime: noteTree.getTreeLoadTime(),
currentNoteId: noteEditor.getCurrentNoteId(),
currentNoteLoadTime: noteEditor.getCurrentNoteLoadTime()
}),
statusCode: {
401: () => {
// if the user got logged out then we should display the page
// here we do that by reloading which will force the redirect if the user is really logged out
window.location.reload(true);
},
409: () => {
// 409 means we need to migrate database, reload will take care of it
window.location.reload(true);
}
}
});
// if (resp.changedTree) {
// console.log("Reloading tree because of background changes");
//
// noteTree.reload();
// }
//
// if (resp.changedCurrentNote) {
// showMessage('Reloading note because background change');
//
// noteEditor.reload();
// }
//changesToPushCountEl.html(resp.changesToPushCount);
}
//setInterval(checkStatus, 5 * 1000);
return {
checkStatus
};
})();

2
public/javascripts/sync.js
View File

@ -6,8 +6,6 @@ function syncNow() {
type: 'POST', type: 'POST',
success: result => { success: result => {
if (result.success) { if (result.success) {
status.checkStatus();
showMessage("Sync finished successfully."); showMessage("Sync finished successfully.");
} }
else { else {

36
routes/api/status.js
View File

@ -1,36 +0,0 @@
"use strict";
const express = require('express');
const router = express.Router();
const sql = require('../../services/sql');
const options = require('../../services/options');
const auth = require('../../services/auth');
const sync = require('../../services/sync');
const source_id = require('../../services/source_id');
router.post('', auth.checkApiAuth, async (req, res, next) => {
const treeLoadTime = req.body.treeLoadTime;
const currentNoteId = req.body.currentNoteId;
const currentNoteLoadTime = req.body.currentNoteLoadTime;
const noteTreeChangesCount = await sql.getSingleValue("SELECT COUNT(*) FROM sync WHERE entity_name = 'notes_tree' AND source_id != ? " +
"AND sync_date >= ?", [source_id.currentSourceId, treeLoadTime]);
const currentNoteChangesCount = await sql.getSingleValue("SELECT COUNT(*) FROM sync WHERE source_id != ? " +
"AND sync_date >= ? AND entity_name = 'notes' AND entity_id = ?", [source_id.currentSourceId, currentNoteLoadTime, currentNoteId]);
let changesToPushCount = 0;
if (sync.isSyncSetup) {
const lastSyncedPush = await options.getOption('last_synced_push');
changesToPushCount = await sql.getSingleValue("SELECT COUNT(*) FROM sync WHERE id > ?", [lastSyncedPush]);
}
res.send({
'changedTree': noteTreeChangesCount > 0,
'changedCurrentNote': currentNoteChangesCount > 0,
'changesToPushCount': changesToPushCount
});
});
module.exports = router;

2
routes/routes.js
View File

@ -7,7 +7,6 @@ const migrationRoute = require('./migration');
const treeApiRoute = require('./api/tree'); const treeApiRoute = require('./api/tree');
const notesApiRoute = require('./api/notes'); const notesApiRoute = require('./api/notes');
const notesMoveApiRoute = require('./api/notes_move'); const notesMoveApiRoute = require('./api/notes_move');
const statusApiRoute = require('./api/status');
const noteHistoryApiRoute = require('./api/note_history'); const noteHistoryApiRoute = require('./api/note_history');
const recentChangesApiRoute = require('./api/recent_changes'); const recentChangesApiRoute = require('./api/recent_changes');
const settingsApiRoute = require('./api/settings'); const settingsApiRoute = require('./api/settings');
@ -28,7 +27,6 @@ function register(app) {
app.use('/api/tree', treeApiRoute); app.use('/api/tree', treeApiRoute);
app.use('/api/notes', notesApiRoute); app.use('/api/notes', notesApiRoute);
app.use('/api/notes', notesMoveApiRoute); app.use('/api/notes', notesMoveApiRoute);
app.use('/api/status', statusApiRoute);
app.use('/api/notes-history', noteHistoryApiRoute); app.use('/api/notes-history', noteHistoryApiRoute);
app.use('/api/recent-changes', recentChangesApiRoute); app.use('/api/recent-changes', recentChangesApiRoute);
app.use('/api/settings', settingsApiRoute); app.use('/api/settings', settingsApiRoute);