Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

make prefix optional for blobstore/list-blobs

This commit is contained in:
Joost Diepenmaat 2011-03-15 15:49:00 +01:00
parent 5983eb0402
commit 23e988ef5a
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
blobstore/src/main/clojure/org/jclouds/blobstore.clj
View File

@ -141,8 +141,10 @@ Options can also be specified for extension modules
(defn- list-blobs-chunk [container prefix #^BlobStore blobstore & [marker]] (defn- list-blobs-chunk [container prefix #^BlobStore blobstore & [marker]]
(apply list-container blobstore container (apply list-container blobstore container
:in-directory prefix (when (string? marker) (concat (when prefix
[:after-marker marker]))) [:in-directory prefix])
(when (string? marker)
[:after-marker marker]))))
(defn- list-blobs-chunks [container prefix #^BlobStore blobstore marker] (defn- list-blobs-chunks [container prefix #^BlobStore blobstore marker]
(when marker (when marker
@ -161,7 +163,9 @@ Note: (apply concat coll) or (lazy-cat coll) are not lazy wrt coll itself."
(defn list-blobs (defn list-blobs
"Returns a lazy seq of all blobs in the given container." "Returns a lazy seq of all blobs in the given container."
([container prefix #^BlobStore blobstore] ([container prefix #^BlobStore blobstore]
(concat-elements (list-blobs-chunks container prefix blobstore :start)))) (concat-elements (list-blobs-chunks container prefix blobstore :start)))
([container #^BlobStore blobstore]
(list-blobs container nil blobstore)))
(defn locations (defn locations
"Retrieve the available container locations for the blobstore context." "Retrieve the available container locations for the blobstore context."