Support nested folder for rules and commands

Fixes #220

Author: ericdallo

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+- Support nested folder for rules and commands. #220
+
 ## 0.81.0
 
 - Support rollback file changes done by `write_file`, `edit_file` and `move_file`. #218

src/eca/features/commands.clj

@@ -27,24 +27,26 @@
                             (io/file (config/get-property "user.home") ".config"))
         commands-dir (io/file xdg-config-home "eca" "commands")]
     (when (fs/exists? commands-dir)
-      (map (fn [file]
-             {:name (normalize-command-name file)
-              :path (str (fs/canonicalize file))
-              :type :user-global-file
-              :content (slurp (fs/file file))})
-           (fs/list-dir commands-dir)))))
+      (keep (fn [file]
+              (when-not (fs/directory? file)
+                {:name (normalize-command-name file)
+                 :path (str (fs/canonicalize file))
+                 :type :user-global-file
+                 :content (slurp (fs/file file))}))
+            (fs/glob commands-dir "**" {:follow-links true})))))
 
 (defn ^:private local-file-commands [roots]
   (->> roots
        (mapcat (fn [{:keys [uri]}]
                  (let [commands-dir (fs/file (shared/uri->filename uri) ".eca" "commands")]
                    (when (fs/exists? commands-dir)
-                     (fs/list-dir commands-dir)))))
-       (map (fn [file]
-              {:name (normalize-command-name file)
-               :path (str (fs/canonicalize file))
-               :type :user-local-file
-               :content (slurp (fs/file file))}))))
+                     (fs/glob commands-dir "**" {:follow-links true})))))
+       (keep (fn [file]
+               (when-not (fs/directory? file)
+                 {:name (normalize-command-name file)
+                  :path (str (fs/canonicalize file))
+                  :type :user-local-file
+                  :content (slurp (fs/file file))})))))
 
 (defn ^:private config-commands [config roots]
   (->> (get config :commands)

src/eca/features/rules.clj

@@ -12,24 +12,26 @@
                             (io/file (config/get-property "user.home") ".config"))
         rules-dir (io/file xdg-config-home "eca" "rules")]
     (when (fs/exists? rules-dir)
-      (map (fn [file]
-             {:name (fs/file-name file)
-              :path (str (fs/canonicalize file))
-              :type :user-global-file
-              :content (slurp (fs/file file))})
-           (fs/list-dir rules-dir)))))
+      (keep (fn [file]
+              (when-not (fs/directory? file)
+                {:name (fs/file-name file)
+                 :path (str (fs/canonicalize file))
+                 :type :user-global-file
+                 :content (slurp (fs/file file))}))
+            (fs/glob rules-dir "**" {:follow-links true})))))
 
 (defn ^:private local-file-rules [roots]
   (->> roots
        (mapcat (fn [{:keys [uri]}]
                  (let [rules-dir (fs/file (shared/uri->filename uri) ".eca" "rules")]
                    (when (fs/exists? rules-dir)
-                     (fs/list-dir rules-dir)))))
-       (map (fn [file]
-              {:name (fs/file-name file)
-               :path (str (fs/canonicalize file))
-               :type :user-local-file
-               :content (slurp (fs/file file))}))))
+                     (fs/glob rules-dir "**" {:follow-links true})))))
+       (keep (fn [file]
+               (when-not (fs/directory? file)
+                 {:name (fs/file-name file)
+                  :path (str (fs/canonicalize file))
+                  :type :user-local-file
+                  :content (slurp (fs/file file))})))))
 
 (defn ^:private config-rules [config roots]
   (->> (get config :rules)

test/eca/features/rules_test.clj

@@ -27,7 +27,7 @@
     (with-redefs [fs/absolute? (constantly false)
                   fs/exists? #(contains? #{(h/file-path "/my/project/.eca/rules")
                                            (h/file-path "/my/project/.foo/cool-rule.md")} (str %))
-                  fs/list-dir (constantly [])
+                  fs/glob (constantly [])
                   fs/canonicalize identity
                   fs/file-name (constantly "cool-name")
                   clojure.core/slurp (constantly "MY_RULE_CONTENT")]
@@ -42,7 +42,7 @@
 
   (testing "local file rules"
     (with-redefs [fs/exists? #(= (h/file-path "/my/project/.eca/rules") (str %))
-                  fs/list-dir (constantly [(fs/path "cool.md")])
+                  fs/glob (constantly [(fs/path "cool.md")])
                   fs/canonicalize identity
                   fs/file-name (constantly "cool-name")
                   clojure.core/slurp (constantly "MY_RULE_CONTENT")]
@@ -56,7 +56,7 @@
   (testing "global file rules"
     (with-redefs [config/get-env (constantly (h/file-path "/home/someuser/.config"))
                   fs/exists? #(= (h/file-path "/home/someuser/.config/eca/rules") (str %))
-                  fs/list-dir (constantly [(fs/path "cool.md")])
+                  fs/glob (constantly [(fs/path "cool.md")])
                   fs/canonicalize identity
                   fs/file-name (constantly "cool-name")
                   clojure.core/slurp (constantly "MY_RULE_CONTENT")]