aboutsummaryrefslogtreecommitdiff
path: root/src/main/scala/xyz/driver/core/file/S3Storage.scala
diff options
context:
space:
mode:
authorJakob Odersky <jakob@driver.xyz>2017-07-25 00:16:26 -0700
committerJakob Odersky <jakob@driver.xyz>2017-07-25 00:16:26 -0700
commit124fd35527601c61c20f7f9e4a3d099c5e0b883b (patch)
tree3e904260f77fbaeb01efa7c4117da4e7eaff95c9 /src/main/scala/xyz/driver/core/file/S3Storage.scala
parentb6fd7800eb503da02ca9724c081b9dd590341bca (diff)
downloaddriver-core-124fd35527601c61c20f7f9e4a3d099c5e0b883b.tar.gz
driver-core-124fd35527601c61c20f7f9e4a3d099c5e0b883b.tar.bz2
driver-core-124fd35527601c61c20f7f9e4a3d099c5e0b883b.zip
Add streaming download to file storage.v0.14.0
This enables downloading of content without saving it to a file.
Diffstat (limited to 'src/main/scala/xyz/driver/core/file/S3Storage.scala')
-rw-r--r--src/main/scala/xyz/driver/core/file/S3Storage.scala13
1 files changed, 12 insertions, 1 deletions
diff --git a/src/main/scala/xyz/driver/core/file/S3Storage.scala b/src/main/scala/xyz/driver/core/file/S3Storage.scala
index 7df3db2..49bebc8 100644
--- a/src/main/scala/xyz/driver/core/file/S3Storage.scala
+++ b/src/main/scala/xyz/driver/core/file/S3Storage.scala
@@ -1,5 +1,8 @@
package xyz.driver.core.file
+import akka.NotUsed
+import akka.stream.scaladsl.{Source, StreamConverters}
+import akka.util.ByteString
import java.io.File
import java.nio.file.{Path, Paths}
import java.util.UUID.randomUUID
@@ -12,7 +15,8 @@ import xyz.driver.core.time.Time
import scala.concurrent.{ExecutionContext, Future}
import scalaz.{ListT, OptionT}
-class S3Storage(s3: AmazonS3, bucket: Name[Bucket], executionContext: ExecutionContext) extends FileStorage {
+class S3Storage(s3: AmazonS3, bucket: Name[Bucket], executionContext: ExecutionContext, chunkSize: Int = 4096)
+ extends FileStorage {
implicit private val execution = executionContext
override def upload(localSource: File, destination: Path): Future[Unit] = Future {
@@ -36,6 +40,13 @@ class S3Storage(s3: AmazonS3, bucket: Name[Bucket], executionContext: ExecutionC
}
})
+ override def stream(filePath: Path): OptionT[Future, Source[ByteString, NotUsed]] =
+ OptionT.optionT(Future {
+ Option(s3.getObject(new GetObjectRequest(bucket.value, filePath.toString))).map { elem =>
+ StreamConverters.fromInputStream(elem.getObjectContent, chunkSize).mapMaterializedValue(_ => NotUsed)
+ }
+ })
+
override def delete(filePath: Path): Future[Unit] = Future {
s3.deleteObject(bucket.value, filePath.toString)
}