abhin4v
/
clj-lastfm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

made the functions lazy

master
Abhinav Sarkar 2010-07-25 00:12:39 +05:30
parent ad523ca0e8
commit 64ee5361b5
1 changed files with 30 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/clj_lastfm/core.clj
View File

@ -96,7 +96,7 @@
(defn- create-get-obj-fn [fixed-params parse-fn] (defn- create-get-obj-fn [fixed-params parse-fn]
(fn [more-params] (fn [more-params]
(parse-fn (get-data (merge fixed-params more-params))))) (parse-fn #(get-data (merge fixed-params more-params)))))
(defn- create-get-obj-field-fn [create-obj-fn extract-obj-id-fields-fn] (defn- create-get-obj-field-fn [create-obj-fn extract-obj-id-fields-fn]
(fn [obj field-kw] (fn [obj field-kw]
@ -106,13 +106,14 @@
field-val)))) field-val))))
(defn- create-parse-one-or-more-fn [parse-one-fn extractor-fn] (defn- create-parse-one-or-more-fn [parse-one-fn extractor-fn]
(fn [data] (fn [data-fn]
(let [one-or-more (extractor-fn data)] (lazy-seq
(let [data (data-fn) one-or-more (extractor-fn data)]
(do (do
(debug (str "parsing: " data)) (debug (str "parsing: " data))
(if (map? one-or-more) (if (map? one-or-more)
(vector (parse-one-fn one-or-more)) (vector (parse-one-fn one-or-more))
(vec (map parse-one-fn one-or-more))))))) (vec (map parse-one-fn one-or-more))))))))
(defn- create-parse-string-or-list-fn [obj-from-name-fn extractor-fn] (defn- create-parse-string-or-list-fn [obj-from-name-fn extractor-fn]
(fn [data] (fn [data]
@ -229,13 +230,14 @@
;;;;;;;;;; artist.getinfo ;;;;;;;;;; ;;;;;;;;;; artist.getinfo ;;;;;;;;;;
(defn- parse-artist-getinfo [data] (defn- parse-artist-getinfo [data-fn]
(let [data (data-fn)]
(do (do
(debug (str "parse-artist-getinfo: " data)) (debug (str "parse-artist-getinfo: " data))
(-> data :artist parse-artist))) (-> data :artist parse-artist))))
(def #^{:private true} (def #^{:private true} get-artist
get-artist (create-get-obj-fn {:method "artist.getinfo"} parse-artist-getinfo)) (create-get-obj-fn {:method "artist.getinfo"} parse-artist-getinfo))
(defmulti artist (defmulti artist
(fn [artist-or-mbid & _] (fn [artist-or-mbid & _]
@ -417,15 +419,17 @@
(declare get-artist-pastevents) (declare get-artist-pastevents)
(defn- parse-artist-pastevents [data] (defn- parse-artist-pastevents [data-fn]
(let [pages (-> data :events attr-kw :totalPages safe-parse-int) (lazy-seq
(let [data (data-fn)
pages (-> data :events attr-kw :totalPages safe-parse-int)
page (-> data :events attr-kw :page safe-parse-int) page (-> data :events attr-kw :page safe-parse-int)
artist-name (-> data :events attr-kw :artist)] artist-name (-> data :events attr-kw :artist)]
(if (= page pages) (if (= page pages)
(parse-artist-events data) (parse-artist-events data-fn)
(lazy-cat (lazy-cat
(parse-artist-events data) (parse-artist-events data-fn)
(get-artist-pastevents {:artist artist-name :page (inc page)}))))) (get-artist-pastevents {:artist artist-name :page (inc page)}))))))
(defn- get-artist-pastevents (defn- get-artist-pastevents
([params] ([params]