aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakob Odersky <jakob@driver.xyz>2017-07-31 18:58:38 -0700
committerJakob Odersky <jakob@driver.xyz>2017-07-31 18:58:38 -0700
commit59655964902b3c75e8e1f06e2f7d2cf038126fb3 (patch)
treee79e4fb6b7ff484708409e63ff7d3e2e4dad9e44
parentdbb6db9f3545a6638b3941f4160e0fa2dd4a628c (diff)
downloaddriver-core-59655964902b3c75e8e1f06e2f7d2cf038126fb3.tar.gz
driver-core-59655964902b3c75e8e1f06e2f7d2cf038126fb3.tar.bz2
driver-core-59655964902b3c75e8e1f06e2f7d2cf038126fb3.zip
Fix GCS streaming and listingv0.14.3
-rw-r--r--src/main/scala/xyz/driver/core/file/GcsStorage.scala5
1 files 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