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

always use template strings instead of string concatenation

Browse Source
This commit is contained in:
zadam
2022-12-21 15:19:05 +01:00
parent ea006993f6
commit 1b24276a4a
154 changed files with 433 additions and 437 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/services/sync.js
View File

@@ -72,7 +72,8 @@ async function sync() {
};
}
else {
log.info("sync failed: " + e.message + "\nstack: " + e.stack);
log.info(`sync failed: ${e.message}
stack: ${e.stack}`);
ws.syncFailed();
@@ -221,7 +222,7 @@ async function pushChanges(syncContext) {
ws.syncPushInProgress();
log.info(`Sync ${logMarkerId}: Pushing ${entityChangesRecords.length} sync changes in ` + (Date.now() - startDate.getTime()) + "ms");
log.info(`Sync ${logMarkerId}: Pushing ${entityChangesRecords.length} sync changes in ${Date.now() - startDate.getTime()}ms`);
lastSyncedPush = entityChangesRecords[entityChangesRecords.length - 1].entityChange.id;
@@ -311,7 +312,7 @@ function getEntityChangeRow(entityName, entityId) {
const primaryKey = entityConstructor.getEntityFromEntityName(entityName).primaryKeyName;
if (!primaryKey) {
throw new Error("Unknown entity " + entityName);
throw new Error(`Unknown entity ${entityName}`);
}
const entity = sql.getRow(`SELECT * FROM ${entityName} WHERE ${primaryKey} = ?`, [entityId]);
@@ -367,7 +368,7 @@ function setLastSyncedPull(entityChangeId) {
const lastSyncedPullOption = becca.getOption('lastSyncedPull');
if (lastSyncedPullOption) { // might be null in initial sync when becca is not loaded
lastSyncedPullOption.value = entityChangeId + '';
lastSyncedPullOption.value = `${entityChangeId}`;
}
// this way we avoid updating entity_changes which otherwise means that we've never pushed all entity_changes
@@ -388,7 +389,7 @@ function setLastSyncedPush(entityChangeId) {
const lastSyncedPushOption = becca.getOption('lastSyncedPush');
if (lastSyncedPushOption) { // might be null in initial sync when becca is not loaded
lastSyncedPushOption.value = entityChangeId + '';
lastSyncedPushOption.value = `${entityChangeId}`;
}
// this way we avoid updating entity_changes which otherwise means that we've never pushed all entity_changes