From 2a6580d34241f1941ab4a4030da1dcbd54619535 Mon Sep 17 00:00:00 2001 From: Phil Hagelberg Date: Thu, 11 Mar 2010 17:07:14 -0800 Subject: [PATCH] Switch arg name back to dir from prefix; trim long lines. (Too used to S3 where dirs are a figment of our imagination and prefixes are what really matter.) --- blobstore/src/main/clojure/org/jclouds/blobstore.clj | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/blobstore/src/main/clojure/org/jclouds/blobstore.clj b/blobstore/src/main/clojure/org/jclouds/blobstore.clj index 4e074b9985..4965aa93ec 100644 --- a/blobstore/src/main/clojure/org/jclouds/blobstore.clj +++ b/blobstore/src/main/clojure/org/jclouds/blobstore.clj @@ -85,7 +85,8 @@ Options can also be specified for extension modules (def list-options (apply array-map (concat (make-option-map option-fn-0arg [:recursive]) - (make-option-map option-fn-1arg [:after-marker :in-directory :max-results])))) + (make-option-map option-fn-1arg [:after-marker :in-directory + :max-results])))) (defn- list-options-apply [single target key value] @@ -110,7 +111,8 @@ Options can also be specified for extension modules (let [single-keywords #{:recursive} options (parse-args (next args) single-keywords {}) list-options (reduce - #(list-options-apply single-keywords %1 (first %2) (second %2)) + #(list-options-apply single-keywords %1 + (first %2) (second %2)) (ListContainerOptions.) options)] (.list blobstore (first args) list-options)) @@ -227,9 +229,9 @@ example: ([blobstore container-name] (.list (as-blobstore blobstore) container-name)) - ([blobstore container-name prefix] + ([blobstore container-name dir] (.list (as-blobstore blobstore) container-name - (.inDirectory (new ListContainerOptions) prefix)))) + (.inDirectory (new ListContainerOptions) dir)))) (defn create-blob "Create an blob representing text data: