Normalize token name on creation

This commit is contained in:
Andrey Antukh 2025-03-14 11:53:09 +01:00
parent a9e8d8f8f7
commit 559dcabf0e
2 changed files with 26 additions and 9 deletions

View file

@ -251,6 +251,12 @@
[name] [name]
(split-path name set-separator)) (split-path name set-separator))
(defn normalize-set-name
[name]
(->> (split-token-set-name name)
(map str/trim)
(str/join set-separator)))
(defn get-token-set-path [token-set] (defn get-token-set-path [token-set]
(let [path (get-path token-set set-separator)] (let [path (get-path token-set set-separator)]
(add-token-set-paths-prefix path))) (add-token-set-paths-prefix path)))

View file

@ -136,15 +136,26 @@
ptk/WatchEvent ptk/WatchEvent
(watch [it state _] (watch [it state _]
(let [token-set' (-> token-set (let [token-set'
(update :name #(if (empty? %) ;; FIXME: wtf is this?
set-name (update token-set :name #(if (empty? %)
(ctob/join-set-path [% set-name])))) set-name
data (dsh/lookup-file-data state) (ctob/join-set-path [% set-name])))
token-set-name (:name token-set')
changes (-> (pcb/empty-changes it) token-set'
(pcb/with-library-data data) (update token-set' :name ctob/normalize-set-name)
(pcb/set-token-set token-set-name false token-set'))]
data
(dsh/lookup-file-data state)
token-set-name
(:name token-set')
changes
(-> (pcb/empty-changes it)
(pcb/with-library-data data)
(pcb/set-token-set token-set-name false token-set'))]
(rx/of (set-selected-token-set-name token-set-name) (rx/of (set-selected-token-set-name token-set-name)
(dch/commit-changes changes)))))) (dch/commit-changes changes))))))