summaryrefslogtreecommitdiff
path: root/lib/models/revision.js
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--lib/models/revision.js48
1 files changed, 24 insertions, 24 deletions
diff --git a/lib/models/revision.js b/lib/models/revision.js
index dbd76e4e..80136c68 100644
--- a/lib/models/revision.js
+++ b/lib/models/revision.js
@@ -1,22 +1,22 @@
'use strict'
// external modules
-var Sequelize = require('sequelize')
-var async = require('async')
-var moment = require('moment')
-var childProcess = require('child_process')
-var shortId = require('shortid')
-var path = require('path')
+const Sequelize = require('sequelize')
+const async = require('async')
+const moment = require('moment')
+const childProcess = require('child_process')
+const shortId = require('shortid')
+const path = require('path')
-var Op = Sequelize.Op
+const Op = Sequelize.Op
// core
-var logger = require('../logger')
+const logger = require('../logger')
-var dmpWorker = createDmpWorker()
-var dmpCallbackCache = {}
+let dmpWorker = createDmpWorker()
+const dmpCallbackCache = {}
function createDmpWorker () {
- var worker = childProcess.fork(path.resolve(__dirname, '../workers/dmpWorker.js'), {
+ const worker = childProcess.fork(path.resolve(__dirname, '../workers/dmpWorker.js'), {
stdio: 'ignore'
})
logger.debug('dmp worker process started')
@@ -24,7 +24,7 @@ function createDmpWorker () {
if (!data || !data.msg || !data.cacheKey) {
return logger.error('dmp worker error: not enough data on message')
}
- var cacheKey = data.cacheKey
+ const cacheKey = data.cacheKey
switch (data.msg) {
case 'error':
dmpCallbackCache[cacheKey](data.error, null)
@@ -44,7 +44,7 @@ function createDmpWorker () {
function sendDmpWorker (data, callback) {
if (!dmpWorker) dmpWorker = createDmpWorker()
- var cacheKey = Date.now() + '_' + shortId.generate()
+ const cacheKey = Date.now() + '_' + shortId.generate()
dmpCallbackCache[cacheKey] = callback
data = Object.assign(data, {
cacheKey: cacheKey
@@ -53,7 +53,7 @@ function sendDmpWorker (data, callback) {
}
module.exports = function (sequelize, DataTypes) {
- var Revision = sequelize.define('Revision', {
+ const Revision = sequelize.define('Revision', {
id: {
type: DataTypes.UUID,
primaryKey: true,
@@ -116,9 +116,9 @@ module.exports = function (sequelize, DataTypes) {
},
order: [['createdAt', 'DESC']]
}).then(function (revisions) {
- var data = []
- for (var i = 0, l = revisions.length; i < l; i++) {
- var revision = revisions[i]
+ const data = []
+ for (let i = 0, l = revisions.length; i < l; i++) {
+ const revision = revisions[i]
data.push({
time: moment(revision.createdAt).valueOf(),
length: revision.length
@@ -199,12 +199,12 @@ module.exports = function (sequelize, DataTypes) {
}
}).then(function (notes) {
if (notes.length <= 0) return callback(null, notes)
- var savedNotes = []
+ const savedNotes = []
async.each(notes, function (note, _callback) {
// revision saving policy: note not been modified for 5 mins or not save for 10 mins
if (note.lastchangeAt && note.savedAt) {
- var lastchangeAt = moment(note.lastchangeAt)
- var savedAt = moment(note.savedAt)
+ const lastchangeAt = moment(note.lastchangeAt)
+ const savedAt = moment(note.savedAt)
if (moment().isAfter(lastchangeAt.add(5, 'minutes'))) {
savedNotes.push(note)
Revision.saveNoteRevision(note, _callback)
@@ -223,7 +223,7 @@ module.exports = function (sequelize, DataTypes) {
return callback(err, null)
}
// return null when no notes need saving at this moment but have delayed tasks to be done
- var result = ((savedNotes.length === 0) && (notes.length > savedNotes.length)) ? null : savedNotes
+ const result = ((savedNotes.length === 0) && (notes.length > savedNotes.length)) ? null : savedNotes
return callback(null, result)
})
}).catch(function (err) {
@@ -250,9 +250,9 @@ module.exports = function (sequelize, DataTypes) {
return callback(err, null)
})
} else {
- var latestRevision = revisions[0]
- var lastContent = latestRevision.content || latestRevision.lastContent
- var content = note.content
+ const latestRevision = revisions[0]
+ const lastContent = latestRevision.content || latestRevision.lastContent
+ const content = note.content
sendDmpWorker({
msg: 'create patch',
lastDoc: lastContent,