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

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.)
This commit is contained in:
Phil Hagelberg 2010-03-11 17:07:14 -08:00
parent 4f097cd21c
commit 2a6580d342
1 changed files with 6 additions and 4 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

@ -85,7 +85,8 @@ Options can also be specified for extension modules
(def list-options (def list-options
(apply array-map (apply array-map
(concat (make-option-map option-fn-0arg [:recursive]) (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 (defn- list-options-apply
[single target key value] [single target key value]
@ -110,7 +111,8 @@ Options can also be specified for extension modules
(let [single-keywords #{:recursive} (let [single-keywords #{:recursive}
options (parse-args (next args) single-keywords {}) options (parse-args (next args) single-keywords {})
list-options (reduce list-options (reduce
#(list-options-apply single-keywords %1 (first %2) (second %2)) #(list-options-apply single-keywords %1
(first %2) (second %2))
(ListContainerOptions.) (ListContainerOptions.)
options)] options)]
(.list blobstore (first args) list-options)) (.list blobstore (first args) list-options))
@ -227,9 +229,9 @@ example:
([blobstore container-name] ([blobstore container-name]
(.list (as-blobstore blobstore) container-name)) (.list (as-blobstore blobstore) container-name))
([blobstore container-name prefix] ([blobstore container-name dir]
(.list (as-blobstore blobstore) container-name (.list (as-blobstore blobstore) container-name
(.inDirectory (new ListContainerOptions) prefix)))) (.inDirectory (new ListContainerOptions) dir))))
(defn create-blob (defn create-blob
"Create an blob representing text data: "Create an blob representing text data: