kiss-lang/nat-archive-tool
1
0
Fork 0
Code Issues 4 Pull Requests Actions Packages Projects Releases Wiki Activity

Fix SelectByName double-selecting

Browse Source
This commit is contained in:
Nat Quayle Nelson
2023-12-25 14:11:37 -07:00
parent 011f36231d
commit 1b7d2bcd62
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/nat/SelectionCommands.kiss
View File

@@ -81,4 +81,4 @@
// so Cats may be the canonical name // so Cats may be the canonical name
(defSelectCommand SelectByName [name (Text null)] (defSelectCommand SelectByName [name (Text null)]
(nameSystem.getEntries name)) (nameSystem.getEntries archive name))

10
src/nat/systems/NameSystem.kiss
View File

@@ -1,6 +1,6 @@
(load "../Lib.kiss") (load "../Lib.kiss")
(prop :Map<String,Array<Entry>> entriesByName (new Map)) (prop :Map<String,Map<String,Bool>> entriesByName (new Map))
// Stores a case-insensitive map of named entries, for instant lookup by name // Stores a case-insensitive map of named entries, for instant lookup by name
(defNew [] (defNew []
@@ -9,13 +9,13 @@
->[archive e] (hasComponent e Name) ->[archive e] (hasComponent e Name)
->[archive e &opt ui] (let [name (readComponent e Name)] ->[archive e &opt ui] (let [name (readComponent e Name)]
(if (entriesByName.exists (name.toLowerCase)) (if (entriesByName.exists (name.toLowerCase))
(.push (dictGet entriesByName (name.toLowerCase)) e) (dictSet (dictGet entriesByName (name.toLowerCase)) e.id true)
(dictSet entriesByName (name.toLowerCase) [e])) (dictSet entriesByName (name.toLowerCase) [=>e.id true]))
// Because the if statement doesn't unify by type :( // Because the if statement doesn't unify by type :(
null))) null)))
(method :Array<Entry> getEntries [name] (method :Array<Entry> getEntries [:nat.Archive archive name]
(let [entries (dictGet entriesByName (name.toLowerCase))] (let [entries (dictGet entriesByName (name.toLowerCase))]
(if entries (if entries
entries (for id (entries.keys) (dictGet archive.entries id))
[]))) [])))