Skip to content

Fix downloaded version #12

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
merged 2 commits into from
Apr 4, 2025
Merged

Fix downloaded version #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
28f5e37
Fix downloaded version
ericdallo Apr 3, 2025
bdd368d
CHANGELOG
ericdallo Apr 3, 2025
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

## Unreleased

- Fix cached downloaded binary to check if downloaded version matches the current version in plugin.

## 2.0.0

- Fix --settings flag
Expand Down
17 changes: 13 additions & 4 deletions src/leiningen/clojure_lsp/binary.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
(clojure.java.io/copy stream dest-file))
(recur (.getNextEntry stream))))))

(defn ^:private download! [^File download-path version]
(defn ^:private download! [^File download-path ^File server-version-path version]
(let [platform (os-name)
arch (os-arch)
artifact-name (get-in artifacts [platform arch])
Expand All @@ -57,14 +57,18 @@
(doto download-path
(.setWritable true)
(.setReadable true)
(.setExecutable true))))
(.setExecutable true))
(spit server-version-path version)))

(defn ^:private server-version []
(string/trim (slurp (io/resource "CLOJURE_LSP_VERSION"))))

(defn ^:private server-path ^File []
(io/file (global-cache-dir) "clojure-lsp"))

(defn ^:private server-version-path ^File []
(io/file (global-cache-dir) "version.txt"))

(defn ^:private run-lsp! [^File path args]
(let [p (process/process {:cmd (concat [(.getAbsolutePath path)] args)})]
(future
Expand All @@ -82,14 +86,19 @@
(recur))))))
@p))

(defn ^:private download-server? [server-path server-version-path version]
(or (not (.exists server-path))
(not= (slurp server-version-path) version)))

(defn run! [args]
(let [server-path (server-path)
server-version-path (server-version-path)
server-version (server-version)]
(when-not (.exists server-path)
(when (download-server? server-path server-version-path server-version)
(binding [*out* *err*]
(println "Downloading and caching clojure-lsp to" (str server-path)))
(let [t (System/currentTimeMillis)]
(download! server-path server-version)
(download! server-path server-version-path server-version)
(binding [*out* *err*]
(println (format "Downloaded clojure-lsp took %sms" (- (System/currentTimeMillis) t))))))
(run-lsp! server-path args)))