diff options
| author | Jakob Odersky <jakob@driver.xyz> | 2017-09-20 19:05:33 -0700 |
|---|---|---|
| committer | Jakob Odersky <jakob@driver.xyz> | 2017-09-20 19:05:33 -0700 |
| commit | 037f522caf47d70d674daba62b540a451542c64d (patch) | |
| tree | beede74dd7c32eea5395565a1a071f40d1b15507 | |
| parent | 6ac9f69274df066c64a12bb9541f1f07d827a097 (diff) | |
| download | driver-core-037f522caf47d70d674daba62b540a451542c64d.tar.gz driver-core-037f522caf47d70d674daba62b540a451542c64d.tar.bz2 driver-core-037f522caf47d70d674daba62b540a451542c64d.zip | |
Fix directory listing of GCS bucketsv0.16.10
| -rw-r--r-- | build.sbt | 2 | ||||
| -rw-r--r-- | src/main/scala/xyz/driver/core/file/GcsStorage.scala | 10 |
2 files changed, 9 insertions, 3 deletions
@@ -17,7 +17,7 @@ lazy val core = (project in file(".")) "com.github.swagger-akka-http" %% "swagger-akka-http" % "0.9.1", "com.amazonaws" % "aws-java-sdk-s3" % "1.11.26", "com.google.cloud" % "google-cloud-pubsub" % "0.17.2-alpha", - "com.google.cloud" % "google-cloud-storage" % "1.0.1", + "com.google.cloud" % "google-cloud-storage" % "1.6.0", "com.typesafe.slick" %% "slick" % "3.1.1", "com.typesafe" % "config" % "1.2.1", "com.typesafe.scala-logging" %% "scala-logging" % "3.5.0", diff --git a/src/main/scala/xyz/driver/core/file/GcsStorage.scala b/src/main/scala/xyz/driver/core/file/GcsStorage.scala index 76438cf..629b1d8 100644 --- a/src/main/scala/xyz/driver/core/file/GcsStorage.scala +++ b/src/main/scala/xyz/driver/core/file/GcsStorage.scala @@ -84,13 +84,19 @@ class GcsStorage(storageClient: Storage, override def list(directoryPath: Path): ListT[Future, FileLink] = ListT.listT(Future { + val directory = s"$directoryPath/" val page = storageClient.list( bucketName.value, BlobListOption.currentDirectory(), - BlobListOption.prefix(s"$directoryPath/") + BlobListOption.prefix(directory) ) - page.iterateAll().asScala.map(blobToFileLink(directoryPath, _)).toList + page + .iterateAll() + .asScala + .filter(_.getName != directory) + .map(blobToFileLink(directoryPath, _)) + .toList }) protected def blobToFileLink(path: Path, blob: Blob): FileLink = { |