From 59655964902b3c75e8e1f06e2f7d2cf038126fb3 Mon Sep 17 00:00:00 2001 From: Jakob Odersky Date: Mon, 31 Jul 2017 18:58:38 -0700 Subject: Fix GCS streaming and listing --- src/main/scala/xyz/driver/core/file/GcsStorage.scala | 5 +++-- 1 file changed, 3 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 4ceab79..65a5a50 100644 --- a/src/main/scala/xyz/driver/core/file/GcsStorage.scala +++ b/src/main/scala/xyz/driver/core/file/GcsStorage.scala @@ -62,6 +62,7 @@ class GcsStorage(storageClient: Storage, val buffer = ByteBuffer.allocate(chunkSize) val length = rc.read(buffer) if (length > 0) { + buffer.flip() Some(ByteString.fromByteBuffer(buffer)) } else { None @@ -100,8 +101,8 @@ class GcsStorage(storageClient: Storage, val size = Option(blob.getSize).getOrElse(nullError("a size")) FileLink( - Name(name), - Paths.get(path.toString, name), + Name(name.split('/').last), + Paths.get(name), Revision(generation.toString), Time(updateTime), size -- cgit v1.2.3