From 037f522caf47d70d674daba62b540a451542c64d Mon Sep 17 00:00:00 2001 From: Jakob Odersky Date: Wed, 20 Sep 2017 19:05:33 -0700 Subject: Fix directory listing of GCS buckets --- src/main/scala/xyz/driver/core/file/GcsStorage.scala | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'src/main/scala') 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 = { -- cgit v1.2.3