replace some functions with a new :CONSFIGURATOR-CACHE connattr

This simplifies the API.

Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>

1 files changed, 5 insertions, 5 deletions

diff --git a/src/data.lisp b/src/data.lisp
index d87e648..4962ae0 100644
--- a/src/data.lisp
+++ b/src/data.lisp
@@ -403,7 +403,8 @@ no risk of clashes between fresly generated files and cached copies of files."
      (if version pn (ensure-directory-pathname pn)))))
 
 (defun remote-data-pathname (&rest args)
-  (apply #'data-pathname (get-remote-data-cache-dir) args))
+  (apply #'data-pathname
+         (merge-pathnames "data/" (get-connattr :consfigurator-cache)) args))
 
 
 ;;;; Remote caches
@@ -420,13 +421,12 @@ of CONNECTION, where each entry is of the form
     (mapcar (lambda (line)
               (mapcar #'filename->string (split-string line :separator "/")))
             (multiple-value-bind (out exit)
-                (mrun :may-fail "find" (get-remote-data-cache-dir)
+                (mrun :may-fail "find" (merge-pathnames
+                                        "data/"
+                                        (get-connattr :consfigurator-cache))
                       "-type" "f" "-printf" "%P\\n")
               (and (zerop exit) (lines out))))))
 
-(defun get-remote-data-cache-dir ()
-  (remote-consfigurator-cache-pathname "data/"))
-
 
 ;;;; Local caches