clone/logseq
1
0
Fork 0
mirror of https://github.com/logseq/logseq.git synced 2026-05-24 04:34:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(cli): config.edn reading and writing incorrectly

Browse Source 
from a literal '~' directory under current directory
because it wasn't expanded
This commit is contained in:
Gabriel Horner
2026-04-28 13:37:31 -04:00
parent 6d91d8ccae
commit 90891fdab7
2 changed files with 29 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/main/logseq/cli/config.cljs
View File

@@ -4,9 +4,9 @@
[clojure.string :as string]
[goog.object :as gobj]
["fs" :as fs]
["os" :as os]
["path" :as node-path]
[logseq.cli.output-mode :as output-mode]))
[logseq.cli.output-mode :as output-mode]
[logseq.cli.root-dir :as root-dir]))
(defn- parse-int
[value]
@@ -30,19 +30,15 @@
:else nil))
(defn- default-root-dir
[]
"~/logseq")
(defn- default-config-path
([]
(default-config-path (default-root-dir)))
(default-config-path (root-dir/default-root-dir)))
([root-dir]
(node-path/join root-dir "cli.edn")))
(defn server-list-path
[root-dir]
(node-path/join (or root-dir (node-path/join (.homedir os) "logseq")) "server-list"))
(node-path/join (or root-dir (root-dir/default-root-dir)) "server-list"))
(def ^:private removed-config-keys
#{:auth-token :retries :e2ee-password})
@@ -67,7 +63,7 @@
(defn update-config!
[{:keys [config-path root-dir]} updates]
(let [path (or config-path (default-config-path (or root-dir (default-root-dir))))
(let [path (or config-path (default-config-path (root-dir/normalize-root-dir root-dir)))
current (or (read-config-file path) {})
filtered-current (sanitize-file-config current)
filtered-updates (sanitize-file-config updates)
@@ -115,21 +111,23 @@
:logout-timeout-ms 120000
:list-title-max-display-width list-title-max-display-width-default
:output-format nil
:root-dir (default-root-dir)
:root-dir (root-dir/default-root-dir)
:ws-url "wss://api.logseq.io/sync/%s"
:http-base "https://api.logseq.io"}
env (env-config)
root-dir (or (:root-dir opts)
(:root-dir env)
(:root-dir defaults))
root-dir (root-dir/normalize-root-dir
(or (:root-dir opts)
(:root-dir env)
(:root-dir defaults)))
config-path (or (:config-path opts)
(:config-path env)
(default-config-path root-dir))
file-config (or (read-config-file config-path) {})
root-dir (or (:root-dir opts)
(:root-dir env)
(:root-dir file-config)
root-dir)
root-dir (root-dir/normalize-root-dir
(or (:root-dir opts)
(:root-dir env)
(:root-dir file-config)
root-dir))
output-format (or (output-mode/parse (:output-format opts))
(output-mode/parse (:output opts))
(output-mode/parse (:output-format env))

20
src/test/logseq/cli/config_test.cljs
View File

@@ -48,7 +48,7 @@
result (with-env env #(config/resolve-config opts))]
(is (= cfg-path (:config-path result)))
(is (= "cli-repo" (:graph result)))
(is (= "cli-root" (:root-dir result)))
(is (= (node-path/resolve "cli-root") (:root-dir result)))
(is (= 333 (:timeout-ms result)))
(is (= 888 (:login-timeout-ms result)))
(is (= 999 (:logout-timeout-ms result)))
@@ -65,7 +65,7 @@
"LOGSEQ_CLI_ROOT_DIR" "env-root"}
result (with-env env #(config/resolve-config {:config-path cfg-path}))]
(is (= "env-repo" (:graph result)))
(is (= "env-root" (:root-dir result)))))
(is (= (node-path/resolve "env-root") (:root-dir result)))))
(deftest test-output-format-env-overrides-file
(let [dir (node-helper/create-tmp-dir)
@@ -110,7 +110,7 @@
"LOGSEQ_CLI_CONFIG" nil}
#(config/resolve-config {:config-path cfg-path}))]
(is (= cfg-path (:config-path result)))
(is (= "~/logseq" (:root-dir result)))
(is (= (node-path/join (.homedir os) "logseq") (:root-dir result)))
(is (= "wss://api.logseq.io/sync/%s" (:ws-url result)))
(is (= "https://api.logseq.io" (:http-base result)))
(is (= 10000 (:timeout-ms result)))
@@ -127,8 +127,8 @@
"LOGSEQ_CLI_OUTPUT" nil
"LOGSEQ_CLI_CONFIG" nil}
#(config/resolve-config {:root-dir "~/custom-logseq"}))]
(is (= "~/custom-logseq" (:root-dir result)))
(is (= (node-path/join "~/custom-logseq" "cli.edn")
(is (= (node-path/join (.homedir os) "custom-logseq") (:root-dir result)))
(is (= (node-path/join (.homedir os) "custom-logseq" "cli.edn")
(:config-path result)))))
(deftest test-explicit-config-path-does-not-change-root-dir-derived-defaults
@@ -137,7 +137,7 @@
result (config/resolve-config {:config-path cfg-path
:root-dir "~/custom-logseq"})]
(is (= cfg-path (:config-path result)))
(is (= "~/custom-logseq" (:root-dir result)))))
(is (= (node-path/join (.homedir os) "custom-logseq") (:root-dir result)))))
(deftest test-server-list-path-follows-root-dir
(let [root-dir (node-path/join (node-helper/create-tmp-dir "cli-root") "nested-root")
@@ -202,3 +202,11 @@
parsed (reader/read-string contents)]
(is (= "old" (:graph parsed)))
(is (not (contains? parsed :auth-token)))))
(deftest test-update-config-expands-tilde-in-root-dir
(let [dir (node-helper/create-tmp-dir "cli-tilde")
cfg-path (node-path/join dir "cli.edn")
_ (config/update-config! {:root-dir dir} {:ws-url "wss://example.com"})
contents (.toString (fs/readFileSync cfg-path) "utf8")
parsed (reader/read-string contents)]
(is (= "wss://example.com" (:ws-url parsed)))))