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

Remove unnecessary try/catch around 'createReadStream'

Browse source
This commit is contained in:
Simon Detheridge 2020-03-04 16:38:05 +00:00
parent a7198764cb
commit 30114cd79b
4 changed files with 2 additions and 108 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
services/filestore/app/js/GcsPersistor.js
View file

@ -53,18 +53,7 @@ const GcsPersistor = {
module.exports = GcsPersistor module.exports = GcsPersistor
async function sendFile(bucketName, key, fsPath) { async function sendFile(bucketName, key, fsPath) {
let readStream return sendStream(bucketName, key, fs.createReadStream(fsPath))
try {
readStream = fs.createReadStream(fsPath)
} catch (err) {
throw PersistorHelper.wrapError(
err,
'error reading file from disk',
{ bucketName, key, fsPath },
ReadError
)
}
return sendStream(bucketName, key, readStream)
} }
async function sendStream(bucketName, key, readStream, sourceMd5) { async function sendStream(bucketName, key, readStream, sourceMd5) {

13
services/filestore/app/js/S3Persistor.js
View file

@ -46,18 +46,7 @@ const S3Persistor = {
module.exports = S3Persistor module.exports = S3Persistor
async function sendFile(bucketName, key, fsPath) { async function sendFile(bucketName, key, fsPath) {
let readStream return sendStream(bucketName, key, fs.createReadStream(fsPath))
try {
readStream = fs.createReadStream(fsPath)
} catch (err) {
throw PersistorHelper.wrapError(
err,
'error reading file from disk',
{ bucketName, key, fsPath },
ReadError
)
}
return sendStream(bucketName, key, readStream)
} }
async function sendStream(bucketName, key, readStream, sourceMd5) { async function sendStream(bucketName, key, readStream, sourceMd5) {

42
services/filestore/test/unit/js/GcsPersistorTests.js
View file

@ -440,48 +440,6 @@ describe('GcsPersistorTests', function() {
) )
}) })
}) })
describe('when the file does not exist', function() {
let error
beforeEach(async function() {
Fs.createReadStream = sinon.stub().throws(FileNotFoundError)
try {
await GcsPersistor.promises.sendFile(bucket, key, filename)
} catch (err) {
error = err
}
})
it('returns a NotFoundError', function() {
expect(error).to.be.an.instanceOf(Errors.NotFoundError)
})
it('wraps the error', function() {
expect(error.cause).to.equal(FileNotFoundError)
})
})
describe('when reading the file throws an error', function() {
let error
beforeEach(async function() {
Fs.createReadStream = sinon.stub().throws(genericError)
try {
await GcsPersistor.promises.sendFile(bucket, key, filename)
} catch (err) {
error = err
}
})
it('returns a ReadError', function() {
expect(error).to.be.an.instanceOf(Errors.ReadError)
})
it('wraps the error', function() {
expect(error.cause).to.equal(genericError)
})
})
}) })
describe('copyFile', function() { describe('copyFile', function() {

42
services/filestore/test/unit/js/S3PersistorTests.js
View file

@ -583,48 +583,6 @@ describe('S3PersistorTests', function() {
}) })
}) })
}) })
describe('when the file does not exist', function() {
let error
beforeEach(async function() {
Fs.createReadStream = sinon.stub().throws(FileNotFoundError)
try {
await S3Persistor.promises.sendFile(bucket, key, filename)
} catch (err) {
error = err
}
})
it('returns a NotFoundError', function() {
expect(error).to.be.an.instanceOf(Errors.NotFoundError)
})
it('wraps the error', function() {
expect(error.cause).to.equal(FileNotFoundError)
})
})
describe('when reading the file throws an error', function() {
let error
beforeEach(async function() {
Fs.createReadStream = sinon.stub().throws(genericError)
try {
await S3Persistor.promises.sendFile(bucket, key, filename)
} catch (err) {
error = err
}
})
it('returns a ReadError', function() {
expect(error).to.be.an.instanceOf(Errors.ReadError)
})
it('wraps the error', function() {
expect(error.cause).to.equal(genericError)
})
})
}) })
describe('copyFile', function() { describe('copyFile', function() {