From 57aedefdd38b0d40a2ba607c0f686a8fb93f18c6 Mon Sep 17 00:00:00 2001
From: Shane Kilkelly <shane@kilkelly.me>
Date: Thu, 27 Aug 2015 15:21:33 +0100
Subject: [PATCH] Begin work towards obeying 'Range' headers, thread the `opts`
 down to persistence layer.

---
 services/filestore/app/coffee/FSPersistorManager.coffee     | 2 +-
 services/filestore/app/coffee/FileHandler.coffee            | 2 +-
 services/filestore/app/coffee/S3PersistorManager.coffee     | 4 ++--
 services/filestore/test/unit/coffee/FileHandlerTests.coffee | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/services/filestore/app/coffee/FSPersistorManager.coffee b/services/filestore/app/coffee/FSPersistorManager.coffee
index c2f4564987..719dd1d098 100644
--- a/services/filestore/app/coffee/FSPersistorManager.coffee
+++ b/services/filestore/app/coffee/FSPersistorManager.coffee
@@ -27,7 +27,7 @@ module.exports =
         return callback err
       @sendFile location, target, fsPath, callback
 
-  getFileStream: (location, name, _callback = (err, res)->) ->
+  getFileStream: (location, name, opts, _callback = (err, res)->) ->
     callback = (args...) ->
       _callback(args...)
       _callback = () ->
diff --git a/services/filestore/app/coffee/FileHandler.coffee b/services/filestore/app/coffee/FileHandler.coffee
index 51aec4bba6..16ac56e703 100644
--- a/services/filestore/app/coffee/FileHandler.coffee
+++ b/services/filestore/app/coffee/FileHandler.coffee
@@ -30,7 +30,7 @@ module.exports =
 			@_getConvertedFile bucket, key, opts, callback
 
 	_getStandardFile: (bucket, key, opts, callback)->
-		PersistorManager.getFileStream bucket, key, (err, fileStream)->
+		PersistorManager.getFileStream bucket, key, opts, (err, fileStream)->
 			if err?
 				logger.err  bucket:bucket, key:key, opts:opts, "error getting fileStream"
 			callback err, fileStream
diff --git a/services/filestore/app/coffee/S3PersistorManager.coffee b/services/filestore/app/coffee/S3PersistorManager.coffee
index d5cb06074e..7e0cb3947e 100644
--- a/services/filestore/app/coffee/S3PersistorManager.coffee
+++ b/services/filestore/app/coffee/S3PersistorManager.coffee
@@ -57,8 +57,8 @@ module.exports =
 				logger.err  bucketName:bucketName, key:key, fsPath:fsPath, err:err, "something went wrong writing stream to disk"
 				return callback(err)
 			@sendFile bucketName, key, fsPath, callback
-			
-	getFileStream: (bucketName, key, callback = (err, res)->)->
+
+	getFileStream: (bucketName, key, opts, callback = (err, res)->)->
 		callback = _.once callback
 		logger.log bucketName:bucketName, key:key, "getting file from s3"
 		s3Client = knox.createClient
diff --git a/services/filestore/test/unit/coffee/FileHandlerTests.coffee b/services/filestore/test/unit/coffee/FileHandlerTests.coffee
index 2a2bf6e17d..5457defd16 100644
--- a/services/filestore/test/unit/coffee/FileHandlerTests.coffee
+++ b/services/filestore/test/unit/coffee/FileHandlerTests.coffee
@@ -104,7 +104,7 @@ describe "FileHandler", ->
 
 		beforeEach ->
 			@fileStream = {on:->}
-			@PersistorManager.getFileStream.callsArgWith(2, "err", @fileStream)
+			@PersistorManager.getFileStream.callsArgWith(3, "err", @fileStream)
 
 		it "should get the stream", (done)->
 			@handler.getFile @bucket, @key, null, =>