kiss-lang/kiss-vscode
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor addTags/removeTags to Lib functions

Browse Source
This commit is contained in:
Nat Quayle Nelson
2021-08-02 20:30:08 -06:00
parent 6f429c4d43
commit a70474daad
2 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
projects/nat-archive-tool/src/nat/ArchiveController.kiss
View File

@@ -165,20 +165,13 @@
(defCommand AddTags [entries (SelectedEntries 1 null) (defCommand AddTags [entries (SelectedEntries 1 null)
tagsToAdd (VarText null)] tagsToAdd (VarText null)]
(doFor e entries (doFor e entries
(withWritableEntry archive e (addTags archive e tagsToAdd))
(if (hasComponent e Tags)
(withWritableComponents archive e [tags Tags]
(doFor tag tagsToAdd (dictSet tags tag 1)))
(addComponent archive e Tags (for tag tagsToAdd =>tag 1)))))
entries) // TODO this includes entries that already had the tag in the changeset entries) // TODO this includes entries that already had the tag in the changeset
(defCommand RemoveTags [entries (SelectedEntries 1 null) (defCommand RemoveTags [entries (SelectedEntries 1 null)
tagsToRemove (VarText null)] tagsToRemove (VarText null)]
(doFor e entries (doFor e entries
(withWritableEntry archive e (removeTags archive e tagsToRemove))
(when (hasComponent e Tags)
(withWritableComponents archive e [tags Tags]
(doFor tag tagsToRemove (tags.remove tag))))))
entries) // TODO this includes entries that didn't have the tag in the changeset entries) // TODO this includes entries that didn't have the tag in the changeset
(defCommand SelectByTags [tagsBoolExp (Text null)] (defCommand SelectByTags [tagsBoolExp (Text null)]

27
projects/nat-archive-tool/src/nat/Lib.kiss
View File

@@ -51,13 +51,6 @@
,@saveList ,@saveList
,retValSymbol))) ,retValSymbol)))
(function addFile [:nat.Archive archive :nat.Entry e :String file &opt leaveOriginalCopy]
(let [pathWithoutDir (haxe.io.Path.withoutDirectory file)]
(unless !(= -1 (e.files.indexOf pathWithoutDir))
((if leaveOriginalCopy sys.io.File.copy sys.FileSystem.rename)
file (joinPath archive.archiveDir "files" pathWithoutDir))
(e.files.push pathWithoutDir))))
(defMacro withWritableEntry [archive e &body body] (defMacro withWritableEntry [archive e &body body]
(let [retValSymbol (let [retValSymbol
(symbol)] (symbol)]
@@ -83,3 +76,23 @@
(function componentsMatch [:nat.Entry e componentsBoolExp] (function componentsMatch [:nat.Entry e componentsBoolExp]
(BoolExpInterp.eval componentsBoolExp (for =>cType cId e.components cType))) (BoolExpInterp.eval componentsBoolExp (for =>cType cId e.components cType)))
(function addFile [:nat.Archive archive :nat.Entry e :String file &opt leaveOriginalCopy]
(withWritableEntry archive e
(let [pathWithoutDir (haxe.io.Path.withoutDirectory file)]
(unless !(= -1 (e.files.indexOf pathWithoutDir))
((if leaveOriginalCopy sys.io.File.copy sys.FileSystem.rename)
file (joinPath archive.archiveDir "files" pathWithoutDir))
(e.files.push pathWithoutDir)))))
(function addTags [:nat.Archive archive :nat.Entry e :Array<String> tagsToAdd]
(if (hasComponent e Tags)
(withWritableComponents archive e [tags Tags]
(doFor tag tagsToAdd (dictSet tags tag 1)))
(addComponent archive e Tags (for tag tagsToAdd =>tag 1))))
(function removeTags [:nat.Archive archive :nat.Entry e :Array<String> tagsToRemove]
(when (hasComponent e Tags)
(withWritableComponents archive e [tags Tags]
(doFor tag tagsToRemove (tags.remove tag)))))