Skip to content

Optimize cache for reentrant tools #51

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hlship merged 1 commit into from
Sep 19, 2025
Merged

Optimize cache for reentrant tools #51

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions src/net/lewisship/cli_tools.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,13 +198,14 @@
["-h" "--help" "This command summary"]])

(defn- expand-tool-options
"Expanded dispatch options into tool options, leveraging a cache."
"Expand dispatch options into tool options, leveraging a cache."
[options]
(let [{:keys [tool-name cache-dir]} options
(let [{:keys [tool-name cache-dir cache-digest]} options
cache-dir' (when cache-dir
(fs/expand-home cache-dir))
digest (when cache-dir'
(cache/classpath-digest options))
(or cache-digest
(cache/classpath-digest options)))
cached (when digest
(cache/read-from-cache cache-dir' tool-name digest))
result (if cached
Expand All @@ -214,12 +215,17 @@
(cache/write-to-cache cache-dir' tool-name digest expanded))
expanded))]
(merge result
(select-keys options [:tool-name :doc :arguments :tool-summary]))))
{:cache-digest digest}
(select-keys options [:tool-name :doc :arguments :tool-summary :pre-dispatch]))))

(defn- dispatch*
"Called (indirectly/anonymously) from a tool handler to process remaining command line arguments."
[dispatch-options]
(-> dispatch-options expand-tool-options impl/dispatch))
(let [dispatch-options' (-> dispatch-options expand-tool-options)
{:keys [pre-dispatch]} dispatch-options']
(when pre-dispatch
(pre-dispatch dispatch-options'))
(impl/dispatch dispatch-options')))

(defn- summarize-specs
"Converts a tools.cli command specification to a description of the options; this is an enhanced version of
Expand Down