meissa/cryogen-core
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

more compact get resources

Browse source
This commit is contained in:
jem 2020-02-14 14:17:04 +01:00
parent ea49ced936
commit 4620e51374
1 changed files with 13 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/cryogen_core/classpath_able_io.clj
View file

@ -185,6 +185,8 @@
result)))) result))))
result))) result)))
; TODO: rename? Allow base-path to be ""? ; TODO: rename? Allow base-path to be ""?
; base-path must not be "" ; base-path must not be ""
(defn get-resources-recursive ;:- [Resource] (defn get-resources-recursive ;:- [Resource]
@ -194,35 +196,17 @@
& {:keys [from-cp from-fs] & {:keys [from-cp from-fs]
:or {from-cp true :or {from-cp true
from-fs true}}] from-fs true}}]
(let [fs-resources (if from-fs (let [virtual-path-map (fn [resource] {(:virtual-path resource) resource})
(fs/get-resources fs-prefix base-path paths) fs-resource-map (if from-fs
[]) (apply merge (map virtual-path-map (fs/get-resources fs-prefix base-path paths)))
cp-resources (if from-cp {})
(cp/get-resources base-path paths) cp-resource-map (if from-cp
[]) (apply merge (map virtual-path-map (cp/get-resources base-path paths)))
get-virtual-paths (fn [resources] (map #(:virtual-path %) resources)) {})
virtual-paths (distinct resulting-map (merge fs-resource-map cp-resource-map)]
(into (if (empty? resulting-map)
(get-virtual-paths fs-resources) []
(get-virtual-paths cp-resources))) (vals resulting-map))))
get-resource-local (fn [virtual-path resource-list]
(loop [rl resource-list]
(if (empty? rl)
nil
(let [el (first rl)]
(if (= (:virtual-path el) virtual-path)
el
(recur (rest rl)))))))
get-resource-global (fn [virtual-path resources-prio1 resources-prio2]
(let [prio1 (get-resource-local
virtual-path resources-prio1)]
(if (nil? prio1)
(get-resource-local
virtual-path resources-prio2)
prio1)))]
(map
#(get-resource-global % fs-resources cp-resources)
virtual-paths)))
(defn get-resource-paths-recursive ;:- [VirtualPath] (defn get-resource-paths-recursive ;:- [VirtualPath]
[fs-prefix ;:- Prefix [fs-prefix ;:- Prefix