github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-07 20:31:06 -05:00
Code Issues Projects Releases Packages Wiki Activity

refer to project state as projectStateHash

Browse source
This commit is contained in:
Brian Gough 2017-08-03 12:08:11 +01:00
parent 5c02255e07
commit f44b844d74
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
services/web/app/coffee/Features/Compile/ClsiManager.coffee
View file

@ -123,13 +123,13 @@ module.exports = ClsiManager =
if project.compiler not in ClsiManager.VALID_COMPILERS if project.compiler not in ClsiManager.VALID_COMPILERS
project.compiler = "pdflatex" project.compiler = "pdflatex"
ClsiStateManager.checkProjectStateMatch project_id, project, (error, stateOk, projectState) -> ClsiStateManager.checkProjectStateMatch project_id, project, (error, stateOk, projectStateHash) ->
return callback(error) if error? return callback(error) if error?
logger.log project_id: project_id, checkState: stateOk, "checked project state" logger.log project_id: project_id, checkState: stateOk, "checked project state"
if stateOk and options.syncType isnt "full" # incremental # see if we can send an incremental update to the CLSI
if stateOk and options.syncType isnt "full"
ClsiManager._getContentFromDocUpdater project_id, (error, docUpdaterDocs) -> ClsiManager._getContentFromDocUpdater project_id, (error, docUpdaterDocs) ->
return callback(error) if error? return callback(error) if error?
# make this incremental
ProjectEntityHandler.getAllDocPathsFromProject project, (error, docPath) -> ProjectEntityHandler.getAllDocPathsFromProject project, (error, docPath) ->
return callback(error) if error? return callback(error) if error?
docs = {} docs = {}
@ -137,19 +137,20 @@ module.exports = ClsiManager =
path = docPath[doc._id] path = docPath[doc._id]
docs[path] = doc docs[path] = doc
options.syncType = "incremental" options.syncType = "incremental"
options.syncState = projectState options.syncState = projectStateHash
# send new docs but not files as those are already on the clsi
ClsiManager._finaliseRequest project_id, options, project, docs, [], callback ClsiManager._finaliseRequest project_id, options, project, docs, [], callback
else else
ClsiManager._getContentFromMongo project_id, (error, docs, files) -> ClsiManager._getContentFromMongo project_id, (error, docs, files) ->
return callback(error) if error? return callback(error) if error?
# FIXME want to store state after project has been sent to # FIXME want to store state after project has been sent to
# clsi, but need to do it here. # clsi, but need to do it here.
ClsiStateManager.setProjectState project_id, project, (error, projectState) -> ClsiStateManager.setProjectState project_id, project, (error, projectStateHash) ->
if error? if error?
logger.err err:error, project_id:project_id, "error storing state in redis" logger.err err:error, project_id:project_id, "error storing state in redis"
#return callback(error) #return callback(error)
options.syncType = "full" options.syncType = "full"
options.syncState = projectState options.syncState = projectStateHash
ClsiManager._finaliseRequest project_id, options, project, docs, files, callback ClsiManager._finaliseRequest project_id, options, project, docs, files, callback
_getContentFromDocUpdater: (project_id, callback = (error, docs) ->) -> _getContentFromDocUpdater: (project_id, callback = (error, docs) ->) ->