github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2025-02-17 09:53:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'tpds-cleanup'

Browse source
This commit is contained in:
Henry Oswald 2015-04-23 10:06:26 +01:00
commit 6669884f44
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
services/web/app/coffee/Features/ThirdPartyDataStore/UpdateMerger.coffee
View file

@ -19,11 +19,16 @@ module.exports =
if element? if element?
elementId = element._id elementId = element._id
self.p.writeStreamToDisk project_id, elementId, updateRequest, (err, fsPath)-> self.p.writeStreamToDisk project_id, elementId, updateRequest, (err, fsPath)->
callback = _.wrap callback, (cb, arg) ->
fs.unlink fsPath, (err) ->
if err?
logger.err project_id:project_id, fsPath:fsPath, "error deleting file"
cb(arg)
return callback(err) if err? return callback(err) if err?
FileTypeManager.isBinary path, fsPath, (err, isFile)-> FileTypeManager.isBinary path, fsPath, (err, isFile)->
return callback(err) if err? return callback(err) if err?
if isFile if isFile
self.p.processFile project_id, elementId, fsPath, path, source, callback #TODO clean up the stream written to disk here self.p.processFile project_id, elementId, fsPath, path, source, callback
else else
self.p.processDoc project_id, elementId, fsPath, path, source, callback self.p.processDoc project_id, elementId, fsPath, path, source, callback

5
services/web/test/UnitTests/coffee/ThirdPartyDataStore/UpdateMergerTests.coffee
View file

@ -11,7 +11,8 @@ describe 'UpdateMerger :', ->
@updateReciver = {} @updateReciver = {}
@projectLocator = {} @projectLocator = {}
@projectEntityHandler = {} @projectEntityHandler = {}
@fs = {} @fs =
unlink:sinon.stub().callsArgWith(1)
@FileTypeManager = {} @FileTypeManager = {}
@updateMerger = SandboxedModule.require modulePath, requires: @updateMerger = SandboxedModule.require modulePath, requires:
'../Editor/EditorController': @editorController '../Editor/EditorController': @editorController
@ -50,6 +51,7 @@ describe 'UpdateMerger :', ->
@updateMerger.mergeUpdate @project_id, filePath, @update, @source, => @updateMerger.mergeUpdate @project_id, filePath, @update, @source, =>
@FileTypeManager.isBinary.calledWith(filePath, @fsPath).should.equal true @FileTypeManager.isBinary.calledWith(filePath, @fsPath).should.equal true
@updateMerger.p.processDoc.calledWith(@project_id, doc_id, @fsPath, filePath, @source).should.equal true @updateMerger.p.processDoc.calledWith(@project_id, doc_id, @fsPath, filePath, @source).should.equal true
@fs.unlink.calledWith(@fsPath).should.equal true
done() done()
it 'should process update as file when it is not a doc', (done)-> it 'should process update as file when it is not a doc', (done)->
@ -62,6 +64,7 @@ describe 'UpdateMerger :', ->
@updateMerger.mergeUpdate @project_id, filePath, @update, @source, => @updateMerger.mergeUpdate @project_id, filePath, @update, @source, =>
@updateMerger.p.processFile.calledWith(@project_id, file_id, @fsPath, filePath, @source).should.equal true @updateMerger.p.processFile.calledWith(@project_id, file_id, @fsPath, filePath, @source).should.equal true
@FileTypeManager.isBinary.calledWith(filePath, @fsPath).should.equal true @FileTypeManager.isBinary.calledWith(filePath, @fsPath).should.equal true
@fs.unlink.calledWith(@fsPath).should.equal true
done() done()