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 /src/main/scala/xyz/driver/core/file | |
| 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
Diffstat (limited to 'src/main/scala/xyz/driver/core/file')
| -rw-r--r-- | src/main/scala/xyz/driver/core/file/GcsStorage.scala | 10 |
1 files changed, 8 insertions, 2 deletions
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 = { |