From 92065765c9a01b1c84ed1dcaee83e8948104a347 Mon Sep 17 00:00:00 2001
From: Sean Corfield <sean@corfield.org>
Date: Tue, 15 Nov 2016 17:43:29 -0800
Subject: [PATCH] Enhanced directory-list to work with JAR files from the
 classpath

This should allow FW/1 to find controllers when run from source and when
run from inside a JAR file on the classpath.
---
 resources/fw1.version |  2 +-
 src/framework/one.clj | 31 ++++++++++++++++++++++++++++++-
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/resources/fw1.version b/resources/fw1.version
index 78bc1ab..5712157 100644
--- a/resources/fw1.version
+++ b/resources/fw1.version
@@ -1 +1 @@
-0.10.0
+0.10.1
diff --git a/src/framework/one.clj b/src/framework/one.clj
index 1dff2e9..2fef359 100644
--- a/src/framework/one.clj
+++ b/src/framework/one.clj
@@ -539,10 +539,39 @@
   (reify java.io.FilenameFilter
     (accept [_ dir name] (not (nil? (re-find re name))))))
 
+(defn jar-file-list
+  "Given a JAR file and a regex, return a seq of matching filenames."
+  [jar-file re]
+  (->> jar-file
+       (java.util.jar.JarFile.)
+       (.entries)
+       (iterator-seq)
+       (filter #(re-find re (.getName %)))
+       (map #(.getName %))))
+
+(defn path-file-list
+  "Given a class path element (probably a jar file) and a regex, return a
+  sequence of matching filenames."
+  [path re]
+  (when (str/ends-with? path ".jar")
+    (jar-file-list (io/file path) re)))
+
+(defn class-path-list
+  "Given a regex, look in all the class path files for matching files."
+  [re]
+  (mapcat #(path-file-list % re)
+          (seq (.split (System/getProperty "java.class.path")
+                       (System/getProperty "path.separator")))))
+
 (defn directory-list
   "Given a directory and a regex, return a sorted seq of matching filenames."
   [dir re]
-  (sort (.list (io/file (io/resource dir)) (wildcard-filter re))))
+  (let [r (io/resource dir)]
+    (if (= "file" (.getProtocol r))
+      (sort (.list (io/file r) (wildcard-filter re)))
+      (let [dir-re (re-pattern (str "^" dir "/.*" re))
+            skip   (inc (count dir))]
+        (sort (map #(subs % skip) (class-path-list dir-re)))))))
 
 (defn configure-router
   "Given the application configuration, return a router function that takes a